You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@directory.apache.org by ak...@apache.org on 2011/03/08 01:20:31 UTC
svn commit: r1079047 - in /directory/studio/branches/akarasulu: ./
application/ application/application-linux-x86/src/main/configuration/
application/application-linux-x86_64/src/main/configuration/
application/application-macosx-x86/src/main/configura...
Author: akarasulu
Date: Tue Mar 8 00:20:30 2011
New Revision: 1079047
URL: http://svn.apache.org/viewvc?rev=1079047&view=rev
Log:
merging in from milestones
Modified:
directory/studio/branches/akarasulu/ (props changed)
directory/studio/branches/akarasulu/application/application-linux-x86/src/main/configuration/config.ini
directory/studio/branches/akarasulu/application/application-linux-x86_64/src/main/configuration/config.ini
directory/studio/branches/akarasulu/application/application-macosx-x86/src/main/configuration/config.ini
directory/studio/branches/akarasulu/application/application-macosx-x86_64/src/main/configuration/config.ini
directory/studio/branches/akarasulu/application/application-release/src/main/resources/sign.sh
directory/studio/branches/akarasulu/application/application-win32-x86/src/main/configuration/config.ini
directory/studio/branches/akarasulu/application/application-win32-x86_64/src/main/configuration/config.ini
directory/studio/branches/akarasulu/application/pom.xml
directory/studio/branches/akarasulu/application/settings-hudson.xml
directory/studio/branches/akarasulu/helps/ldapbrowser.help/pom.xml
directory/studio/branches/akarasulu/helps/pom.xml
directory/studio/branches/akarasulu/plugins/apacheds.configuration.v2/pom.xml
directory/studio/branches/akarasulu/plugins/apacheds.configuration/pom.xml
directory/studio/branches/akarasulu/plugins/common.ui/pom.xml
directory/studio/branches/akarasulu/plugins/ldapbrowser.core/antlr.xml
directory/studio/branches/akarasulu/plugins/ldapbrowser.core/pom.xml
directory/studio/branches/akarasulu/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/events/EventRegistry.java
directory/studio/branches/akarasulu/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/editors/searchresult/SearchResultEditorSorter.java
directory/studio/branches/akarasulu/plugins/ldapservers.apacheds.v153/plugin.xml
directory/studio/branches/akarasulu/plugins/ldapservers.apacheds.v154/plugin.xml
directory/studio/branches/akarasulu/plugins/ldapservers.apacheds.v155/plugin.xml
directory/studio/branches/akarasulu/plugins/ldapservers.apacheds.v156/plugin.xml
directory/studio/branches/akarasulu/plugins/ldapservers.apacheds.v157/plugin.xml
directory/studio/branches/akarasulu/plugins/ldapservers/plugin.xml
directory/studio/branches/akarasulu/plugins/ldapservers/resources/ldapServerAdapters.exsd
directory/studio/branches/akarasulu/plugins/ldapservers/src/main/java/org/apache/directory/studio/ldapservers/ConsolePrinterThread.java
directory/studio/branches/akarasulu/plugins/pom.xml
directory/studio/branches/akarasulu/plugins/rcp/Studio-Runtime.launch
directory/studio/branches/akarasulu/plugins/rcp/pom.xml
directory/studio/branches/akarasulu/plugins/rcp/src/main/resources/plugin_customization.ini
directory/studio/branches/akarasulu/plugins/rcp/studio.product
directory/studio/branches/akarasulu/plugins/schemaeditor/pom.xml
directory/studio/branches/akarasulu/pom.xml
directory/studio/branches/akarasulu/repository/pom.xml
Propchange: directory/studio/branches/akarasulu/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Mar 8 00:20:30 2011
@@ -1,4 +1,4 @@
-/directory/studio/branches/milestones:1072812-1075331
+/directory/studio/branches/milestones:1072812-1075331,1078335-1079045
/directory/studio/branches/shared-trunk-merge:1004968-1005876
/directory/studio/branches/studio-connection-refactoring:1022102-1030058
-/directory/studio/trunk:1066125-1067996,1068027-1072726,1072812-1075332
+/directory/studio/trunk:1066125-1067996,1068027-1072726,1072812-1075332,1075834-1079041
Modified: directory/studio/branches/akarasulu/application/application-linux-x86/src/main/configuration/config.ini
URL: http://svn.apache.org/viewvc/directory/studio/branches/akarasulu/application/application-linux-x86/src/main/configuration/config.ini?rev=1079047&r1=1079046&r2=1079047&view=diff
==============================================================================
--- directory/studio/branches/akarasulu/application/application-linux-x86/src/main/configuration/config.ini (original)
+++ directory/studio/branches/akarasulu/application/application-linux-x86/src/main/configuration/config.ini Tue Mar 8 00:20:30 2011
@@ -1,4 +1,21 @@
-#Product Runtime Configuration File
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
+# Product Runtime Configuration File
osgi.splashPath=platform:/base/plugins/org.apache.directory.studio.rcp
eclipse.product=org.apache.directory.studio.rcp.product
Modified: directory/studio/branches/akarasulu/application/application-linux-x86_64/src/main/configuration/config.ini
URL: http://svn.apache.org/viewvc/directory/studio/branches/akarasulu/application/application-linux-x86_64/src/main/configuration/config.ini?rev=1079047&r1=1079046&r2=1079047&view=diff
==============================================================================
--- directory/studio/branches/akarasulu/application/application-linux-x86_64/src/main/configuration/config.ini (original)
+++ directory/studio/branches/akarasulu/application/application-linux-x86_64/src/main/configuration/config.ini Tue Mar 8 00:20:30 2011
@@ -1,4 +1,21 @@
-#Product Runtime Configuration File
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
+# Product Runtime Configuration File
osgi.splashPath=platform:/base/plugins/org.apache.directory.studio.rcp
eclipse.product=org.apache.directory.studio.rcp.product
Modified: directory/studio/branches/akarasulu/application/application-macosx-x86/src/main/configuration/config.ini
URL: http://svn.apache.org/viewvc/directory/studio/branches/akarasulu/application/application-macosx-x86/src/main/configuration/config.ini?rev=1079047&r1=1079046&r2=1079047&view=diff
==============================================================================
--- directory/studio/branches/akarasulu/application/application-macosx-x86/src/main/configuration/config.ini (original)
+++ directory/studio/branches/akarasulu/application/application-macosx-x86/src/main/configuration/config.ini Tue Mar 8 00:20:30 2011
@@ -1,4 +1,21 @@
-#Product Runtime Configuration File
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
+# Product Runtime Configuration File
osgi.splashPath=platform:/base/plugins/org.apache.directory.studio.rcp
eclipse.product=org.apache.directory.studio.rcp.product
Modified: directory/studio/branches/akarasulu/application/application-macosx-x86_64/src/main/configuration/config.ini
URL: http://svn.apache.org/viewvc/directory/studio/branches/akarasulu/application/application-macosx-x86_64/src/main/configuration/config.ini?rev=1079047&r1=1079046&r2=1079047&view=diff
==============================================================================
--- directory/studio/branches/akarasulu/application/application-macosx-x86_64/src/main/configuration/config.ini (original)
+++ directory/studio/branches/akarasulu/application/application-macosx-x86_64/src/main/configuration/config.ini Tue Mar 8 00:20:30 2011
@@ -1,4 +1,21 @@
-#Product Runtime Configuration File
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
+# Product Runtime Configuration File
osgi.splashPath=platform:/base/plugins/org.apache.directory.studio.rcp
eclipse.product=org.apache.directory.studio.rcp.product
Modified: directory/studio/branches/akarasulu/application/application-release/src/main/resources/sign.sh
URL: http://svn.apache.org/viewvc/directory/studio/branches/akarasulu/application/application-release/src/main/resources/sign.sh?rev=1079047&r1=1079046&r2=1079047&view=diff
==============================================================================
--- directory/studio/branches/akarasulu/application/application-release/src/main/resources/sign.sh (original)
+++ directory/studio/branches/akarasulu/application/application-release/src/main/resources/sign.sh Tue Mar 8 00:20:30 2011
@@ -1,4 +1,20 @@
#!/bin/sh
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
PASSWORD=@password@
Modified: directory/studio/branches/akarasulu/application/application-win32-x86/src/main/configuration/config.ini
URL: http://svn.apache.org/viewvc/directory/studio/branches/akarasulu/application/application-win32-x86/src/main/configuration/config.ini?rev=1079047&r1=1079046&r2=1079047&view=diff
==============================================================================
--- directory/studio/branches/akarasulu/application/application-win32-x86/src/main/configuration/config.ini (original)
+++ directory/studio/branches/akarasulu/application/application-win32-x86/src/main/configuration/config.ini Tue Mar 8 00:20:30 2011
@@ -1,4 +1,21 @@
-#Product Runtime Configuration File
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
+# Product Runtime Configuration File
osgi.splashPath=platform:/base/plugins/org.apache.directory.studio.rcp
eclipse.product=org.apache.directory.studio.rcp.product
Modified: directory/studio/branches/akarasulu/application/application-win32-x86_64/src/main/configuration/config.ini
URL: http://svn.apache.org/viewvc/directory/studio/branches/akarasulu/application/application-win32-x86_64/src/main/configuration/config.ini?rev=1079047&r1=1079046&r2=1079047&view=diff
==============================================================================
--- directory/studio/branches/akarasulu/application/application-win32-x86_64/src/main/configuration/config.ini (original)
+++ directory/studio/branches/akarasulu/application/application-win32-x86_64/src/main/configuration/config.ini Tue Mar 8 00:20:30 2011
@@ -1,4 +1,21 @@
-#Product Runtime Configuration File
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
+# Product Runtime Configuration File
osgi.splashPath=platform:/base/plugins/org.apache.directory.studio.rcp
eclipse.product=org.apache.directory.studio.rcp.product
Modified: directory/studio/branches/akarasulu/application/pom.xml
URL: http://svn.apache.org/viewvc/directory/studio/branches/akarasulu/application/pom.xml?rev=1079047&r1=1079046&r2=1079047&view=diff
==============================================================================
--- directory/studio/branches/akarasulu/application/pom.xml (original)
+++ directory/studio/branches/akarasulu/application/pom.xml Tue Mar 8 00:20:30 2011
@@ -221,6 +221,47 @@
</configuration>
</plugin>
</plugins>
+ <pluginManagement>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.rat</groupId>
+ <artifactId>apache-rat-plugin</artifactId>
+ <configuration>
+ <excludeSubProjects>false</excludeSubProjects>
+ <excludes>
+ <!-- MAVEN_DEFAULT_EXCLUDES -->
+ <exclude>**/target/**/*</exclude>
+ <exclude>**/cobertura.ser</exclude>
+ <!-- ECLIPSE_DEFAULT_EXCLUDES -->
+ <exclude>**/.classpath</exclude>
+ <exclude>**/.project</exclude>
+ <exclude>**/.settings/**/*</exclude>
+ <!-- IDEA_DEFAULT_EXCLUDES -->
+ <exclude>**/*.iml</exclude>
+ <exclude>**/*.ipr</exclude>
+ <exclude>**/*.iws</exclude>
+ <!-- MANIFEST_MF_EXCLUDES -->
+ <exclude>**/MANIFEST.MF</exclude>
+ <!-- Missing license header in dependency reduced pom, see http://jira.codehaus.org/browse/MSHADE-48 -->
+ <exclude>**/dependency-reduced-pom.xml</exclude>
+ <!-- GITIGNORE_EXCLUDES -->
+ <exclude>**/.gitignore</exclude>
+ <!-- ABOUT_EXCLUDES -->
+ <exclude>**/about.ini</exclude>
+ <exclude>**/about_files/*</exclude>
+ <!-- LOG_FILES_EXCLUDES -->
+ <exclude>**/*.log</exclude>
+ <exclude>**/*.vm</exclude>
+ <!-- NSIS_EXCLUDES -->
+ <exclude>**/src/main/resources/AdvUninstLog.nsh</exclude>
+ <!-- OTHER_EXCLUDES -->
+ <exclude>docs/**/*</exclude>
+ <exclude>application-updatesite/src/main/resources/*</exclude>
+ </excludes>
+ </configuration>
+ </plugin>
+ </plugins>
+ </pluginManagement>
</build>
</project>
Modified: directory/studio/branches/akarasulu/application/settings-hudson.xml
URL: http://svn.apache.org/viewvc/directory/studio/branches/akarasulu/application/settings-hudson.xml?rev=1079047&r1=1079046&r2=1079047&view=diff
==============================================================================
--- directory/studio/branches/akarasulu/application/settings-hudson.xml (original)
+++ directory/studio/branches/akarasulu/application/settings-hudson.xml Tue Mar 8 00:20:30 2011
@@ -1,3 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+-->
<settings>
<!-- These settings are used on Hudson OSX slave to build installers -->
<profiles>
Modified: directory/studio/branches/akarasulu/helps/ldapbrowser.help/pom.xml
URL: http://svn.apache.org/viewvc/directory/studio/branches/akarasulu/helps/ldapbrowser.help/pom.xml?rev=1079047&r1=1079046&r2=1079047&view=diff
==============================================================================
--- directory/studio/branches/akarasulu/helps/ldapbrowser.help/pom.xml (original)
+++ directory/studio/branches/akarasulu/helps/ldapbrowser.help/pom.xml Tue Mar 8 00:20:30 2011
@@ -51,5 +51,48 @@
</configuration>
</plugin>
</plugins>
+
+ <pluginManagement>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.rat</groupId>
+ <artifactId>apache-rat-plugin</artifactId>
+ <configuration>
+ <excludeSubProjects>false</excludeSubProjects>
+ <excludes>
+ <!-- MAVEN_DEFAULT_EXCLUDES -->
+ <exclude>**/target/**/*</exclude>
+ <exclude>**/cobertura.ser</exclude>
+ <!-- ECLIPSE_DEFAULT_EXCLUDES -->
+ <exclude>**/.classpath</exclude>
+ <exclude>**/.project</exclude>
+ <exclude>**/.settings/**/*</exclude>
+ <!-- IDEA_DEFAULT_EXCLUDES -->
+ <exclude>**/*.iml</exclude>
+ <exclude>**/*.ipr</exclude>
+ <exclude>**/*.iws</exclude>
+ <!-- MANIFEST_MF_EXCLUDES -->
+ <exclude>**/MANIFEST.MF</exclude>
+ <!-- Missing license header in dependency reduced pom, see http://jira.codehaus.org/browse/MSHADE-48 -->
+ <exclude>**/dependency-reduced-pom.xml</exclude>
+ <!-- GITIGNORE_EXCLUDES -->
+ <exclude>**/.gitignore</exclude>
+ <!-- ABOUT_EXCLUDES -->
+ <exclude>**/about.ini</exclude>
+ <exclude>**/about_files/*</exclude>
+ <!-- LOG_FILES_EXCLUDES -->
+ <exclude>**/*.log</exclude>
+ <exclude>**/*.vm</exclude>
+ <!-- NSIS_EXCLUDES -->
+ <exclude>**/src/main/resources/AdvUninstLog.nsh</exclude>
+ <!-- OTHER_EXCLUDES -->
+ <exclude>src/main/resources/sevenseas.ldif</exclude>
+ <exclude>src/main/resources/html/rfc/*.txt</exclude>
+ <exclude>src/main/resources/html/rfcs/*.txt</exclude>
+ </excludes>
+ </configuration>
+ </plugin>
+ </plugins>
+ </pluginManagement>
</build>
</project>
Modified: directory/studio/branches/akarasulu/helps/pom.xml
URL: http://svn.apache.org/viewvc/directory/studio/branches/akarasulu/helps/pom.xml?rev=1079047&r1=1079046&r2=1079047&view=diff
==============================================================================
--- directory/studio/branches/akarasulu/helps/pom.xml (original)
+++ directory/studio/branches/akarasulu/helps/pom.xml Tue Mar 8 00:20:30 2011
@@ -39,4 +39,48 @@
<module>schemaeditor.help</module>
</modules>
+ <build>
+ <pluginManagement>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.rat</groupId>
+ <artifactId>apache-rat-plugin</artifactId>
+ <configuration>
+ <excludeSubProjects>false</excludeSubProjects>
+ <excludes>
+ <!-- MAVEN_DEFAULT_EXCLUDES -->
+ <exclude>**/target/**/*</exclude>
+ <exclude>**/cobertura.ser</exclude>
+ <!-- ECLIPSE_DEFAULT_EXCLUDES -->
+ <exclude>**/.classpath</exclude>
+ <exclude>**/.project</exclude>
+ <exclude>**/.settings/**/*</exclude>
+ <!-- IDEA_DEFAULT_EXCLUDES -->
+ <exclude>**/*.iml</exclude>
+ <exclude>**/*.ipr</exclude>
+ <exclude>**/*.iws</exclude>
+ <!-- MANIFEST_MF_EXCLUDES -->
+ <exclude>**/MANIFEST.MF</exclude>
+ <!-- Missing license header in dependency reduced pom, see http://jira.codehaus.org/browse/MSHADE-48 -->
+ <exclude>**/dependency-reduced-pom.xml</exclude>
+ <!-- GITIGNORE_EXCLUDES -->
+ <exclude>**/.gitignore</exclude>
+ <!-- ABOUT_EXCLUDES -->
+ <exclude>**/about.ini</exclude>
+ <exclude>**/about_files/*</exclude>
+ <!-- LOG_FILES_EXCLUDES -->
+ <exclude>**/*.log</exclude>
+ <exclude>**/*.vm</exclude>
+ <!-- NSIS_EXCLUDES -->
+ <exclude>**/src/main/resources/AdvUninstLog.nsh</exclude>
+ <!-- OTHER_EXCLUDES -->
+ <exclude>ldapbrowser.help/src/main/resources/sevenseas.ldif</exclude>
+ <exclude>**/src/main/resources/html/rfc/*.txt</exclude>
+ <exclude>**/src/main/resources/html/rfcs/*.txt</exclude>
+ </excludes>
+ </configuration>
+ </plugin>
+ </plugins>
+ </pluginManagement>
+ </build>
</project>
Modified: directory/studio/branches/akarasulu/plugins/apacheds.configuration.v2/pom.xml
URL: http://svn.apache.org/viewvc/directory/studio/branches/akarasulu/plugins/apacheds.configuration.v2/pom.xml?rev=1079047&r1=1079046&r2=1079047&view=diff
==============================================================================
--- directory/studio/branches/akarasulu/plugins/apacheds.configuration.v2/pom.xml (original)
+++ directory/studio/branches/akarasulu/plugins/apacheds.configuration.v2/pom.xml Tue Mar 8 00:20:30 2011
@@ -153,6 +153,44 @@
</configuration>
</plugin>
</plugins>
+ <pluginManagement>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.rat</groupId>
+ <artifactId>apache-rat-plugin</artifactId>
+ <configuration>
+ <excludeSubProjects>false</excludeSubProjects>
+ <excludes>
+ <!-- MAVEN_DEFAULT_EXCLUDES -->
+ <exclude>**/target/**/*</exclude>
+ <exclude>**/cobertura.ser</exclude>
+ <!-- ECLIPSE_DEFAULT_EXCLUDES -->
+ <exclude>**/.classpath</exclude>
+ <exclude>**/.project</exclude>
+ <exclude>**/.settings/**/*</exclude>
+ <!-- IDEA_DEFAULT_EXCLUDES -->
+ <exclude>**/*.iml</exclude>
+ <exclude>**/*.ipr</exclude>
+ <exclude>**/*.iws</exclude>
+ <!-- MANIFEST_MF_EXCLUDES -->
+ <exclude>**/MANIFEST.MF</exclude>
+ <!-- Missing license header in dependency reduced pom, see http://jira.codehaus.org/browse/MSHADE-48 -->
+ <exclude>**/dependency-reduced-pom.xml</exclude>
+ <!-- GITIGNORE_EXCLUDES -->
+ <exclude>**/.gitignore</exclude>
+ <!-- ABOUT_EXCLUDES -->
+ <exclude>**/about.ini</exclude>
+ <exclude>**/about_files/*</exclude>
+ <!-- LOG_FILES_EXCLUDES -->
+ <exclude>**/*.log</exclude>
+ <exclude>**/*.vm</exclude>
+ <!-- OTHER_EXCLUDES -->
+ <exclude>src/main/resources/org/apache/directory/studio/apacheds/configuration/v2/config.ldif</exclude>
+ </excludes>
+ </configuration>
+ </plugin>
+ </plugins>
+ </pluginManagement>
</build>
<dependencies>
Modified: directory/studio/branches/akarasulu/plugins/apacheds.configuration/pom.xml
URL: http://svn.apache.org/viewvc/directory/studio/branches/akarasulu/plugins/apacheds.configuration/pom.xml?rev=1079047&r1=1079046&r2=1079047&view=diff
==============================================================================
--- directory/studio/branches/akarasulu/plugins/apacheds.configuration/pom.xml (original)
+++ directory/studio/branches/akarasulu/plugins/apacheds.configuration/pom.xml Tue Mar 8 00:20:30 2011
@@ -146,6 +146,44 @@
</configuration>
</plugin>
</plugins>
+ <pluginManagement>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.rat</groupId>
+ <artifactId>apache-rat-plugin</artifactId>
+ <configuration>
+ <excludeSubProjects>false</excludeSubProjects>
+ <excludes>
+ <!-- MAVEN_DEFAULT_EXCLUDES -->
+ <exclude>**/target/**/*</exclude>
+ <exclude>**/cobertura.ser</exclude>
+ <!-- ECLIPSE_DEFAULT_EXCLUDES -->
+ <exclude>**/.classpath</exclude>
+ <exclude>**/.project</exclude>
+ <exclude>**/.settings/**/*</exclude>
+ <!-- IDEA_DEFAULT_EXCLUDES -->
+ <exclude>**/*.iml</exclude>
+ <exclude>**/*.ipr</exclude>
+ <exclude>**/*.iws</exclude>
+ <!-- MANIFEST_MF_EXCLUDES -->
+ <exclude>**/MANIFEST.MF</exclude>
+ <!-- Missing license header in dependency reduced pom, see http://jira.codehaus.org/browse/MSHADE-48 -->
+ <exclude>**/dependency-reduced-pom.xml</exclude>
+ <!-- GITIGNORE_EXCLUDES -->
+ <exclude>**/.gitignore</exclude>
+ <!-- ABOUT_EXCLUDES -->
+ <exclude>**/about.ini</exclude>
+ <exclude>**/about_files/*</exclude>
+ <!-- LOG_FILES_EXCLUDES -->
+ <exclude>**/*.log</exclude>
+ <exclude>**/*.vm</exclude>
+ <!-- OTHER_EXCLUDES -->
+ <exclude>src/main/resources/org/apache/directory/studio/apacheds/configuration/spring-beans.dtd</exclude>
+ </excludes>
+ </configuration>
+ </plugin>
+ </plugins>
+ </pluginManagement>
</build>
<dependencies>
Modified: directory/studio/branches/akarasulu/plugins/common.ui/pom.xml
URL: http://svn.apache.org/viewvc/directory/studio/branches/akarasulu/plugins/common.ui/pom.xml?rev=1079047&r1=1079046&r2=1079047&view=diff
==============================================================================
--- directory/studio/branches/akarasulu/plugins/common.ui/pom.xml (original)
+++ directory/studio/branches/akarasulu/plugins/common.ui/pom.xml Tue Mar 8 00:20:30 2011
@@ -139,6 +139,44 @@
</configuration>
</plugin>
</plugins>
+ <pluginManagement>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.rat</groupId>
+ <artifactId>apache-rat-plugin</artifactId>
+ <configuration>
+ <excludeSubProjects>false</excludeSubProjects>
+ <excludes>
+ <!-- MAVEN_DEFAULT_EXCLUDES -->
+ <exclude>**/target/**/*</exclude>
+ <exclude>**/cobertura.ser</exclude>
+ <!-- ECLIPSE_DEFAULT_EXCLUDES -->
+ <exclude>**/.classpath</exclude>
+ <exclude>**/.project</exclude>
+ <exclude>**/.settings/**/*</exclude>
+ <!-- IDEA_DEFAULT_EXCLUDES -->
+ <exclude>**/*.iml</exclude>
+ <exclude>**/*.ipr</exclude>
+ <exclude>**/*.iws</exclude>
+ <!-- MANIFEST_MF_EXCLUDES -->
+ <exclude>**/MANIFEST.MF</exclude>
+ <!-- Missing license header in dependency reduced pom, see http://jira.codehaus.org/browse/MSHADE-48 -->
+ <exclude>**/dependency-reduced-pom.xml</exclude>
+ <!-- GITIGNORE_EXCLUDES -->
+ <exclude>**/.gitignore</exclude>
+ <!-- ABOUT_EXCLUDES -->
+ <exclude>**/about.ini</exclude>
+ <exclude>**/about_files/*</exclude>
+ <!-- LOG_FILES_EXCLUDES -->
+ <exclude>**/*.log</exclude>
+ <exclude>**/*.vm</exclude>
+ <!-- OTHER_EXCLUDES -->
+ <exclude>src/main/java/org/apache/directory/studio/common/ui/filesystem/PathEditorInput.java</exclude>
+ </excludes>
+ </configuration>
+ </plugin>
+ </plugins>
+ </pluginManagement>
</build>
<dependencies>
Modified: directory/studio/branches/akarasulu/plugins/ldapbrowser.core/antlr.xml
URL: http://svn.apache.org/viewvc/directory/studio/branches/akarasulu/plugins/ldapbrowser.core/antlr.xml?rev=1079047&r1=1079046&r2=1079047&view=diff
==============================================================================
--- directory/studio/branches/akarasulu/plugins/ldapbrowser.core/antlr.xml (original)
+++ directory/studio/branches/akarasulu/plugins/ldapbrowser.core/antlr.xml Tue Mar 8 00:20:30 2011
@@ -1,4 +1,22 @@
-<?xml version="1.0"?>
+<?xml version="1.0"?>-
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+-->
<project name="project" default="antlr">
Modified: directory/studio/branches/akarasulu/plugins/ldapbrowser.core/pom.xml
URL: http://svn.apache.org/viewvc/directory/studio/branches/akarasulu/plugins/ldapbrowser.core/pom.xml?rev=1079047&r1=1079046&r2=1079047&view=diff
==============================================================================
--- directory/studio/branches/akarasulu/plugins/ldapbrowser.core/pom.xml (original)
+++ directory/studio/branches/akarasulu/plugins/ldapbrowser.core/pom.xml Tue Mar 8 00:20:30 2011
@@ -141,6 +141,44 @@
</executions>
</plugin>
</plugins>
+ <pluginManagement>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.rat</groupId>
+ <artifactId>apache-rat-plugin</artifactId>
+ <configuration>
+ <excludeSubProjects>false</excludeSubProjects>
+ <excludes>
+ <!-- MAVEN_DEFAULT_EXCLUDES -->
+ <exclude>**/target/**/*</exclude>
+ <exclude>**/cobertura.ser</exclude>
+ <!-- ECLIPSE_DEFAULT_EXCLUDES -->
+ <exclude>**/.classpath</exclude>
+ <exclude>**/.project</exclude>
+ <exclude>**/.settings/**/*</exclude>
+ <!-- IDEA_DEFAULT_EXCLUDES -->
+ <exclude>**/*.iml</exclude>
+ <exclude>**/*.ipr</exclude>
+ <exclude>**/*.iws</exclude>
+ <!-- MANIFEST_MF_EXCLUDES -->
+ <exclude>**/MANIFEST.MF</exclude>
+ <!-- Missing license header in dependency reduced pom, see http://jira.codehaus.org/browse/MSHADE-48 -->
+ <exclude>**/dependency-reduced-pom.xml</exclude>
+ <!-- GITIGNORE_EXCLUDES -->
+ <exclude>**/.gitignore</exclude>
+ <!-- ABOUT_EXCLUDES -->
+ <exclude>**/about.ini</exclude>
+ <exclude>**/about_files/*</exclude>
+ <!-- LOG_FILES_EXCLUDES -->
+ <exclude>**/*.log</exclude>
+ <exclude>**/*.vm</exclude>
+ <!-- OTHER_EXCLUDES -->
+ <exclude>src/main/resources/default_schema.ldif</exclude>
+ </excludes>
+ </configuration>
+ </plugin>
+ </plugins>
+ </pluginManagement>
</build>
<dependencies>
Modified: directory/studio/branches/akarasulu/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/events/EventRegistry.java
URL: http://svn.apache.org/viewvc/directory/studio/branches/akarasulu/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/events/EventRegistry.java?rev=1079047&r1=1079046&r2=1079047&view=diff
==============================================================================
--- directory/studio/branches/akarasulu/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/events/EventRegistry.java (original)
+++ directory/studio/branches/akarasulu/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/events/EventRegistry.java Tue Mar 8 00:20:30 2011
@@ -84,6 +84,7 @@ public class EventRegistry extends Conne
};
}
};
+ System.out.println( "fireSearchUpdated() " + searchUpdateEvent + " - " + source );
searchUpdateEventManager.fire( factory );
}
@@ -135,6 +136,7 @@ public class EventRegistry extends Conne
};
}
};
+ System.out.println( "fireBookmarkUpdated() " + bookmarkUpdateEvent + " - " + source );
bookmarkUpdateEventManager.fire( factory );
}
@@ -187,6 +189,7 @@ public class EventRegistry extends Conne
};
}
};
+ System.out.println( "fireBrowserConnectionUpdated() " + browserConnectionUpdateEvent + " - " + source );
browserConnectionUpdateEventManager.fire( factory );
}
@@ -245,6 +248,7 @@ public class EventRegistry extends Conne
return "EventRunnableFactory [entryUpdateEvent=" + entryUpdateEvent + "]";
}
};
+ System.out.println( "fireEntryUpdated() " + entryUpdateEvent + " - " + source );
entryUpdateEventManager.fire( factory );
}
Modified: directory/studio/branches/akarasulu/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/editors/searchresult/SearchResultEditorSorter.java
URL: http://svn.apache.org/viewvc/directory/studio/branches/akarasulu/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/editors/searchresult/SearchResultEditorSorter.java?rev=1079047&r1=1079046&r2=1079047&view=diff
==============================================================================
--- directory/studio/branches/akarasulu/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/editors/searchresult/SearchResultEditorSorter.java (original)
+++ directory/studio/branches/akarasulu/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/editors/searchresult/SearchResultEditorSorter.java Tue Mar 8 00:20:30 2011
@@ -80,9 +80,10 @@ public class SearchResultEditorSorter ex
sortOrder = BrowserCoreConstants.SORT_ORDER_NONE;
columns = contentProvider.getViewer().getTable().getColumns();
- for ( int i = 0; i < columns.length; i++ )
+
+ for ( TableColumn column : columns )
{
- columns[i].addSelectionListener( this );
+ column.addSelectionListener( this );
}
}
@@ -98,22 +99,29 @@ public class SearchResultEditorSorter ex
this.search = newSearch;
this.showDn = showDn;
- for ( int i = 0; columns != null && i < columns.length; i++ )
+ if ( columns != null )
{
- columns[i].removeSelectionListener( this );
+ for ( TableColumn column : columns )
+ {
+ column.removeSelectionListener( this );
+ }
}
+
columns = contentProvider.getViewer().getTable().getColumns();
- for ( int i = 0; i < columns.length; i++ )
+
+ for ( TableColumn column : columns )
{
- columns[i].addSelectionListener( this );
+ column.addSelectionListener( this );
}
// check sort column
int visibleColumns = search.getReturningAttributes().length;
+
if ( showDn )
{
visibleColumns++;
}
+
if ( visibleColumns < sortBy + 1 )
{
setSortColumn( 0 );
@@ -125,13 +133,17 @@ public class SearchResultEditorSorter ex
public void dispose()
{
- for ( int i = 0; columns != null && i < columns.length; i++ )
+ if ( columns != null )
{
- if ( !columns[i].isDisposed() )
+ for ( TableColumn column : columns )
{
- columns[i].removeSelectionListener( this );
+ if ( !column.isDisposed() )
+ {
+ column.removeSelectionListener( this );
+ }
}
}
+
columns = null;
search = null;
contentProvider = null;
@@ -179,15 +191,17 @@ public class SearchResultEditorSorter ex
sortBy = index;
sortOrder = BrowserCoreConstants.SORT_ORDER_ASCENDING;
}
+
if ( sortOrder == BrowserCoreConstants.SORT_ORDER_NONE )
{
sortBy = BrowserCoreConstants.SORT_BY_NONE;
}
TableColumn[] columns = contentProvider.getViewer().getTable().getColumns();
- for ( int i = 0; i < columns.length; i++ )
+
+ for ( TableColumn column : columns )
{
- columns[i].setImage( null );
+ column.setImage( null );
}
if ( sortOrder == BrowserCoreConstants.SORT_ORDER_ASCENDING )
@@ -256,26 +270,30 @@ public class SearchResultEditorSorter ex
IEntry entry1 = sr1.getEntry();
IEntry entry2 = sr2.getEntry();
- if ( ( entry1 == null ) && ( entry2 == null ) )
+ if ( entry1 == null )
{
- return equal();
+ if ( entry2 == null )
+ {
+ return equal();
+ }
+ else
+ {
+ return lessThan();
+ }
}
- else if ( ( entry1 != null ) && ( entry2 == null ) )
+ else if ( entry2 == null )
{
return greaterThan();
}
- else if ( ( entry1 == null ) && ( entry2 != null ) )
- {
- return lessThan();
- }
else
{
String attributeName;
- if ( showDn && sortBy == 0 )
+
+ if ( showDn && ( sortBy == 0 ) )
{
attributeName = BrowserUIConstants.DN;
}
- else if ( showDn && sortBy > 0 )
+ else if ( showDn && ( sortBy > 0 ) )
{
attributeName = search.getReturningAttributes()[sortBy - 1];
}
@@ -293,15 +311,19 @@ public class SearchResultEditorSorter ex
{
AttributeHierarchy ah1 = entry1.getAttributeWithSubtypes( attributeName );
AttributeHierarchy ah2 = entry2.getAttributeWithSubtypes( attributeName );
- if ( ah1 == null && ah2 == null )
- {
- return equal();
- }
- else if ( ah1 == null && ah2 != null )
+
+ if ( ah1 == null )
{
- return lessThan();
+ if ( ah2 == null )
+ {
+ return equal();
+ }
+ else
+ {
+ return lessThan();
+ }
}
- else if ( ah1 != null && ah2 == null )
+ else if ( ah2 == null )
{
return greaterThan();
}
Modified: directory/studio/branches/akarasulu/plugins/ldapservers.apacheds.v153/plugin.xml
URL: http://svn.apache.org/viewvc/directory/studio/branches/akarasulu/plugins/ldapservers.apacheds.v153/plugin.xml?rev=1079047&r1=1079046&r2=1079047&view=diff
==============================================================================
--- directory/studio/branches/akarasulu/plugins/ldapservers.apacheds.v153/plugin.xml (original)
+++ directory/studio/branches/akarasulu/plugins/ldapservers.apacheds.v153/plugin.xml Tue Mar 8 00:20:30 2011
@@ -1,4 +1,22 @@
<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+-->
<?eclipse version="3.2"?>
<plugin>
<extension
Modified: directory/studio/branches/akarasulu/plugins/ldapservers.apacheds.v154/plugin.xml
URL: http://svn.apache.org/viewvc/directory/studio/branches/akarasulu/plugins/ldapservers.apacheds.v154/plugin.xml?rev=1079047&r1=1079046&r2=1079047&view=diff
==============================================================================
--- directory/studio/branches/akarasulu/plugins/ldapservers.apacheds.v154/plugin.xml (original)
+++ directory/studio/branches/akarasulu/plugins/ldapservers.apacheds.v154/plugin.xml Tue Mar 8 00:20:30 2011
@@ -1,4 +1,22 @@
<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+-->
<?eclipse version="3.2"?>
<plugin>
<extension
Modified: directory/studio/branches/akarasulu/plugins/ldapservers.apacheds.v155/plugin.xml
URL: http://svn.apache.org/viewvc/directory/studio/branches/akarasulu/plugins/ldapservers.apacheds.v155/plugin.xml?rev=1079047&r1=1079046&r2=1079047&view=diff
==============================================================================
--- directory/studio/branches/akarasulu/plugins/ldapservers.apacheds.v155/plugin.xml (original)
+++ directory/studio/branches/akarasulu/plugins/ldapservers.apacheds.v155/plugin.xml Tue Mar 8 00:20:30 2011
@@ -1,4 +1,22 @@
<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+-->
<?eclipse version="3.2"?>
<plugin>
<extension
Modified: directory/studio/branches/akarasulu/plugins/ldapservers.apacheds.v156/plugin.xml
URL: http://svn.apache.org/viewvc/directory/studio/branches/akarasulu/plugins/ldapservers.apacheds.v156/plugin.xml?rev=1079047&r1=1079046&r2=1079047&view=diff
==============================================================================
--- directory/studio/branches/akarasulu/plugins/ldapservers.apacheds.v156/plugin.xml (original)
+++ directory/studio/branches/akarasulu/plugins/ldapservers.apacheds.v156/plugin.xml Tue Mar 8 00:20:30 2011
@@ -1,4 +1,22 @@
<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+-->
<?eclipse version="3.2"?>
<plugin>
<extension
Modified: directory/studio/branches/akarasulu/plugins/ldapservers.apacheds.v157/plugin.xml
URL: http://svn.apache.org/viewvc/directory/studio/branches/akarasulu/plugins/ldapservers.apacheds.v157/plugin.xml?rev=1079047&r1=1079046&r2=1079047&view=diff
==============================================================================
--- directory/studio/branches/akarasulu/plugins/ldapservers.apacheds.v157/plugin.xml (original)
+++ directory/studio/branches/akarasulu/plugins/ldapservers.apacheds.v157/plugin.xml Tue Mar 8 00:20:30 2011
@@ -1,4 +1,22 @@
<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+-->
<?eclipse version="3.2"?>
<plugin>
<extension
Modified: directory/studio/branches/akarasulu/plugins/ldapservers/plugin.xml
URL: http://svn.apache.org/viewvc/directory/studio/branches/akarasulu/plugins/ldapservers/plugin.xml?rev=1079047&r1=1079046&r2=1079047&view=diff
==============================================================================
--- directory/studio/branches/akarasulu/plugins/ldapservers/plugin.xml (original)
+++ directory/studio/branches/akarasulu/plugins/ldapservers/plugin.xml Tue Mar 8 00:20:30 2011
@@ -1,4 +1,22 @@
<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+-->
<?eclipse version="3.2"?>
<plugin>
<extension-point id="ldapServerAdapters" name="LDAP Server Adapters" schema="resources/ldapServerAdapters.exsd"/>
Modified: directory/studio/branches/akarasulu/plugins/ldapservers/resources/ldapServerAdapters.exsd
URL: http://svn.apache.org/viewvc/directory/studio/branches/akarasulu/plugins/ldapservers/resources/ldapServerAdapters.exsd?rev=1079047&r1=1079046&r2=1079047&view=diff
==============================================================================
--- directory/studio/branches/akarasulu/plugins/ldapservers/resources/ldapServerAdapters.exsd (original)
+++ directory/studio/branches/akarasulu/plugins/ldapservers/resources/ldapServerAdapters.exsd Tue Mar 8 00:20:30 2011
@@ -1,4 +1,22 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+-->
<!-- Schema file written by PDE -->
<schema targetNamespace="org.apache.directory.studio.ldapservers" xmlns="http://www.w3.org/2001/XMLSchema">
<annotation>
Modified: directory/studio/branches/akarasulu/plugins/ldapservers/src/main/java/org/apache/directory/studio/ldapservers/ConsolePrinterThread.java
URL: http://svn.apache.org/viewvc/directory/studio/branches/akarasulu/plugins/ldapservers/src/main/java/org/apache/directory/studio/ldapservers/ConsolePrinterThread.java?rev=1079047&r1=1079046&r2=1079047&view=diff
==============================================================================
--- directory/studio/branches/akarasulu/plugins/ldapservers/src/main/java/org/apache/directory/studio/ldapservers/ConsolePrinterThread.java (original)
+++ directory/studio/branches/akarasulu/plugins/ldapservers/src/main/java/org/apache/directory/studio/ldapservers/ConsolePrinterThread.java Tue Mar 8 00:20:30 2011
@@ -1,3 +1,22 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ *
+ */
package org.apache.directory.studio.ldapservers;
Modified: directory/studio/branches/akarasulu/plugins/pom.xml
URL: http://svn.apache.org/viewvc/directory/studio/branches/akarasulu/plugins/pom.xml?rev=1079047&r1=1079046&r2=1079047&view=diff
==============================================================================
--- directory/studio/branches/akarasulu/plugins/pom.xml (original)
+++ directory/studio/branches/akarasulu/plugins/pom.xml Tue Mar 8 00:20:30 2011
@@ -56,4 +56,50 @@
<module>valueeditors</module>
</modules>
+ <build>
+ <pluginManagement>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.rat</groupId>
+ <artifactId>apache-rat-plugin</artifactId>
+ <configuration>
+ <excludeSubProjects>false</excludeSubProjects>
+ <excludes>
+ <!-- MAVEN_DEFAULT_EXCLUDES -->
+ <exclude>**/target/**/*</exclude>
+ <exclude>**/cobertura.ser</exclude>
+ <!-- ECLIPSE_DEFAULT_EXCLUDES -->
+ <exclude>**/.classpath</exclude>
+ <exclude>**/.project</exclude>
+ <exclude>**/.settings/**/*</exclude>
+ <!-- IDEA_DEFAULT_EXCLUDES -->
+ <exclude>**/*.iml</exclude>
+ <exclude>**/*.ipr</exclude>
+ <exclude>**/*.iws</exclude>
+ <!-- MANIFEST_MF_EXCLUDES -->
+ <exclude>**/MANIFEST.MF</exclude>
+ <!-- Missing license header in dependency reduced pom, see http://jira.codehaus.org/browse/MSHADE-48 -->
+ <exclude>**/dependency-reduced-pom.xml</exclude>
+ <!-- GITIGNORE_EXCLUDES -->
+ <exclude>**/.gitignore</exclude>
+ <!-- ABOUT_EXCLUDES -->
+ <exclude>**/about.ini</exclude>
+ <exclude>**/about_files/*</exclude>
+ <!-- LOG_FILES_EXCLUDES -->
+ <exclude>**/*.log</exclude>
+ <exclude>**/*.vm</exclude>
+ <!-- OTHER_EXCLUDES -->
+ <exclude>apacheds.configuration/src/main/resources/org/apache/directory/studio/apacheds/configuration/spring-beans.dtd</exclude>
+ <exclude>apacheds.configuration.v2/src/main/resources/org/apache/directory/studio/apacheds/configuration/v2/config.ldif</exclude>
+ <exclude>common.ui/src/main/java/org/apache/directory/studio/common/ui/filesystem/PathEditorInput.java</exclude>
+ <exclude>ldapbrowser.core/src/main/resources/default_schema.ldif</exclude>
+ <exclude>rcp/resources/icons/linux/studio.xpm</exclude>
+ <exclude>schemaeditor/resources/schemas/openldap/*.xml</exclude>
+ </excludes>
+ </configuration>
+ </plugin>
+ </plugins>
+ </pluginManagement>
+ </build>
+
</project>
Modified: directory/studio/branches/akarasulu/plugins/rcp/Studio-Runtime.launch
URL: http://svn.apache.org/viewvc/directory/studio/branches/akarasulu/plugins/rcp/Studio-Runtime.launch?rev=1079047&r1=1079046&r2=1079047&view=diff
==============================================================================
--- directory/studio/branches/akarasulu/plugins/rcp/Studio-Runtime.launch (original)
+++ directory/studio/branches/akarasulu/plugins/rcp/Studio-Runtime.launch Tue Mar 8 00:20:30 2011
@@ -1,4 +1,22 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+-->
<launchConfiguration type="org.eclipse.pde.ui.RuntimeWorkbench">
<booleanAttribute key="append.args" value="true"/>
<booleanAttribute key="askclear" value="true"/>
Modified: directory/studio/branches/akarasulu/plugins/rcp/pom.xml
URL: http://svn.apache.org/viewvc/directory/studio/branches/akarasulu/plugins/rcp/pom.xml?rev=1079047&r1=1079046&r2=1079047&view=diff
==============================================================================
--- directory/studio/branches/akarasulu/plugins/rcp/pom.xml (original)
+++ directory/studio/branches/akarasulu/plugins/rcp/pom.xml Tue Mar 8 00:20:30 2011
@@ -152,6 +152,44 @@
</configuration>
</plugin>
</plugins>
+ <pluginManagement>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.rat</groupId>
+ <artifactId>apache-rat-plugin</artifactId>
+ <configuration>
+ <excludeSubProjects>false</excludeSubProjects>
+ <excludes>
+ <!-- MAVEN_DEFAULT_EXCLUDES -->
+ <exclude>**/target/**/*</exclude>
+ <exclude>**/cobertura.ser</exclude>
+ <!-- ECLIPSE_DEFAULT_EXCLUDES -->
+ <exclude>**/.classpath</exclude>
+ <exclude>**/.project</exclude>
+ <exclude>**/.settings/**/*</exclude>
+ <!-- IDEA_DEFAULT_EXCLUDES -->
+ <exclude>**/*.iml</exclude>
+ <exclude>**/*.ipr</exclude>
+ <exclude>**/*.iws</exclude>
+ <!-- MANIFEST_MF_EXCLUDES -->
+ <exclude>**/MANIFEST.MF</exclude>
+ <!-- Missing license header in dependency reduced pom, see http://jira.codehaus.org/browse/MSHADE-48 -->
+ <exclude>**/dependency-reduced-pom.xml</exclude>
+ <!-- GITIGNORE_EXCLUDES -->
+ <exclude>**/.gitignore</exclude>
+ <!-- ABOUT_EXCLUDES -->
+ <exclude>**/about.ini</exclude>
+ <exclude>**/about_files/*</exclude>
+ <!-- LOG_FILES_EXCLUDES -->
+ <exclude>**/*.log</exclude>
+ <exclude>**/*.vm</exclude>
+ <!-- OTHER_EXCLUDES -->
+ <exclude>resources/icons/linux/studio.xpm</exclude>
+ </excludes>
+ </configuration>
+ </plugin>
+ </plugins>
+ </pluginManagement>
</build>
<dependencies>
Modified: directory/studio/branches/akarasulu/plugins/rcp/src/main/resources/plugin_customization.ini
URL: http://svn.apache.org/viewvc/directory/studio/branches/akarasulu/plugins/rcp/src/main/resources/plugin_customization.ini?rev=1079047&r1=1079046&r2=1079047&view=diff
==============================================================================
--- directory/studio/branches/akarasulu/plugins/rcp/src/main/resources/plugin_customization.ini (original)
+++ directory/studio/branches/akarasulu/plugins/rcp/src/main/resources/plugin_customization.ini Tue Mar 8 00:20:30 2011
@@ -1,3 +1,20 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
org.eclipse.ui/SHOW_TRADITIONAL_STYLE_TABS=false
org.eclipse.ui/DOCK_PERSPECTIVE_BAR=right
org.eclipse.ui/SHOW_PROGRESS_ON_STARTUP = true
\ No newline at end of file
Modified: directory/studio/branches/akarasulu/plugins/rcp/studio.product
URL: http://svn.apache.org/viewvc/directory/studio/branches/akarasulu/plugins/rcp/studio.product?rev=1079047&r1=1079046&r2=1079047&view=diff
==============================================================================
--- directory/studio/branches/akarasulu/plugins/rcp/studio.product (original)
+++ directory/studio/branches/akarasulu/plugins/rcp/studio.product Tue Mar 8 00:20:30 2011
@@ -1,4 +1,22 @@
<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+-->
<?pde version="3.1"?>
<product name="Apache Directory Studio" id="org.apache.directory.studio.product" application="org.apache.directory.studio.application" useFeatures="true">
Modified: directory/studio/branches/akarasulu/plugins/schemaeditor/pom.xml
URL: http://svn.apache.org/viewvc/directory/studio/branches/akarasulu/plugins/schemaeditor/pom.xml?rev=1079047&r1=1079046&r2=1079047&view=diff
==============================================================================
--- directory/studio/branches/akarasulu/plugins/schemaeditor/pom.xml (original)
+++ directory/studio/branches/akarasulu/plugins/schemaeditor/pom.xml Tue Mar 8 00:20:30 2011
@@ -153,6 +153,44 @@
</executions>
</plugin>
</plugins>
+ <pluginManagement>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.rat</groupId>
+ <artifactId>apache-rat-plugin</artifactId>
+ <configuration>
+ <excludeSubProjects>false</excludeSubProjects>
+ <excludes>
+ <!-- MAVEN_DEFAULT_EXCLUDES -->
+ <exclude>**/target/**/*</exclude>
+ <exclude>**/cobertura.ser</exclude>
+ <!-- ECLIPSE_DEFAULT_EXCLUDES -->
+ <exclude>**/.classpath</exclude>
+ <exclude>**/.project</exclude>
+ <exclude>**/.settings/**/*</exclude>
+ <!-- IDEA_DEFAULT_EXCLUDES -->
+ <exclude>**/*.iml</exclude>
+ <exclude>**/*.ipr</exclude>
+ <exclude>**/*.iws</exclude>
+ <!-- MANIFEST_MF_EXCLUDES -->
+ <exclude>**/MANIFEST.MF</exclude>
+ <!-- Missing license header in dependency reduced pom, see http://jira.codehaus.org/browse/MSHADE-48 -->
+ <exclude>**/dependency-reduced-pom.xml</exclude>
+ <!-- GITIGNORE_EXCLUDES -->
+ <exclude>**/.gitignore</exclude>
+ <!-- ABOUT_EXCLUDES -->
+ <exclude>**/about.ini</exclude>
+ <exclude>**/about_files/*</exclude>
+ <!-- LOG_FILES_EXCLUDES -->
+ <exclude>**/*.log</exclude>
+ <exclude>**/*.vm</exclude>
+ <!-- OTHER_EXCLUDES -->
+ <exclude>resources/schemas/openldap/*.xml</exclude>
+ </excludes>
+ </configuration>
+ </plugin>
+ </plugins>
+ </pluginManagement>
</build>
<dependencies>
Modified: directory/studio/branches/akarasulu/pom.xml
URL: http://svn.apache.org/viewvc/directory/studio/branches/akarasulu/pom.xml?rev=1079047&r1=1079046&r2=1079047&view=diff
==============================================================================
--- directory/studio/branches/akarasulu/pom.xml (original)
+++ directory/studio/branches/akarasulu/pom.xml Tue Mar 8 00:20:30 2011
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.directory.project</groupId>
<artifactId>project</artifactId>
- <version>20</version>
+ <version>21</version>
</parent>
@@ -1803,6 +1803,55 @@
-->
</dependencies>
</plugin>
+ <plugin>
+ <groupId>org.apache.rat</groupId>
+ <artifactId>apache-rat-plugin</artifactId>
+ <configuration>
+ <excludeSubProjects>false</excludeSubProjects>
+ <excludes>
+ <!-- MAVEN_DEFAULT_EXCLUDES -->
+ <exclude>**/target/**/*</exclude>
+ <exclude>**/cobertura.ser</exclude>
+ <!-- ECLIPSE_DEFAULT_EXCLUDES -->
+ <exclude>**/.classpath</exclude>
+ <exclude>**/.project</exclude>
+ <exclude>**/.settings/**/*</exclude>
+ <!-- IDEA_DEFAULT_EXCLUDES -->
+ <exclude>**/*.iml</exclude>
+ <exclude>**/*.ipr</exclude>
+ <exclude>**/*.iws</exclude>
+ <!-- MANIFEST_MF_EXCLUDES -->
+ <exclude>**/MANIFEST.MF</exclude>
+ <!-- Missing license header in dependency reduced pom, see http://jira.codehaus.org/browse/MSHADE-48 -->
+ <exclude>**/dependency-reduced-pom.xml</exclude>
+ <!-- GITIGNORE_EXCLUDES -->
+ <exclude>**/.gitignore</exclude>
+ <!-- ABOUT_EXCLUDES -->
+ <exclude>**/about.ini</exclude>
+ <exclude>**/about_files/*</exclude>
+ <!-- LOG_FILES_EXCLUDES -->
+ <exclude>**/*.log</exclude>
+ <exclude>**/*.vm</exclude>
+ <!-- NSIS_EXCLUDES -->
+ <exclude>**/src/main/resources/AdvUninstLog.nsh</exclude>
+ <!-- OTHER_EXCLUDES -->
+ <exclude>application/docs/**/*</exclude>
+ <exclude>application/application-updatesite/src/main/resources/*</exclude>
+ <exclude>helps/ldapbrowser.help/src/main/resources/sevenseas.ldif</exclude>
+ <exclude>helps/**/src/main/resources/html/rfc/*.txt</exclude>
+ <exclude>helps/**/src/main/resources/html/rfcs/*.txt</exclude>
+ <exclude>plugins/apacheds.configuration/src/main/resources/org/apache/directory/studio/apacheds/configuration/spring-beans.dtd</exclude>
+ <exclude>plugins/apacheds.configuration.v2/src/main/resources/org/apache/directory/studio/apacheds/configuration/v2/config.ldif</exclude>
+ <exclude>plugins/common.ui/src/main/java/org/apache/directory/studio/common/ui/filesystem/PathEditorInput.java</exclude>
+ <exclude>plugins/ldapbrowser.core/src/main/resources/default_schema.ldif</exclude>
+ <exclude>plugins/rcp/resources/icons/linux/studio.xpm</exclude>
+ <exclude>plugins/schemaeditor/resources/schemas/openldap/*.xml</exclude>
+ <exclude>repository/**/*</exclude>
+ <exclude>tests/**/*</exclude>
+ <exclude>tools/**/*</exclude>
+ </excludes>
+ </configuration>
+ </plugin>
</plugins>
</pluginManagement>
</build>
Modified: directory/studio/branches/akarasulu/repository/pom.xml
URL: http://svn.apache.org/viewvc/directory/studio/branches/akarasulu/repository/pom.xml?rev=1079047&r1=1079046&r2=1079047&view=diff
==============================================================================
--- directory/studio/branches/akarasulu/repository/pom.xml (original)
+++ directory/studio/branches/akarasulu/repository/pom.xml Tue Mar 8 00:20:30 2011
@@ -46,6 +46,21 @@
</configuration>
</plugin>
</plugins>
+
+ <pluginManagement>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.rat</groupId>
+ <artifactId>apache-rat-plugin</artifactId>
+ <configuration>
+ <excludeSubProjects>false</excludeSubProjects>
+ <excludes>
+ <exclude>**/*</exclude>
+ </excludes>
+ </configuration>
+ </plugin>
+ </plugins>
+ </pluginManagement>
</build>
<dependencies>