directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From fel...@apache.org
Subject svn commit: r598090 - in /directory/sandbox/felixk: studio-aciitemeditor/ studio-aciitemeditor/META-INF/ studio-apacheds-configuration-help/ studio-apacheds-configuration/ studio-apacheds-configuration/META-INF/ studio-connection-core/ studio-connectio...
Date Sun, 25 Nov 2007 23:22:17 GMT
Author: felixk
Date: Sun Nov 25 15:22:14 2007
New Revision: 598090

URL: http://svn.apache.org/viewvc?rev=598090&view=rev
Log:
Some changes to fix classpath and copy over the needed jar files.
Bundle-Classpath goes at the moment to . and not to lib/.

Still some problems to get it running inside Eclipse. Probably I need to update my sourcecode (anyway).

Modified:
    directory/sandbox/felixk/studio-aciitemeditor/META-INF/MANIFEST.MF
    directory/sandbox/felixk/studio-aciitemeditor/pom.xml
    directory/sandbox/felixk/studio-apacheds-configuration-help/pom.xml
    directory/sandbox/felixk/studio-apacheds-configuration/META-INF/MANIFEST.MF
    directory/sandbox/felixk/studio-apacheds-configuration/pom.xml
    directory/sandbox/felixk/studio-connection-core/META-INF/MANIFEST.MF
    directory/sandbox/felixk/studio-connection-core/pom.xml
    directory/sandbox/felixk/studio-connection-ui/META-INF/MANIFEST.MF
    directory/sandbox/felixk/studio-connection-ui/pom.xml
    directory/sandbox/felixk/studio-jars/pom.xml
    directory/sandbox/felixk/studio-ldapbrowser-common/META-INF/MANIFEST.MF
    directory/sandbox/felixk/studio-ldapbrowser-common/pom.xml
    directory/sandbox/felixk/studio-ldapbrowser-core/META-INF/MANIFEST.MF
    directory/sandbox/felixk/studio-ldapbrowser-core/pom.xml
    directory/sandbox/felixk/studio-ldapbrowser-help/pom.xml
    directory/sandbox/felixk/studio-ldapbrowser-ui/META-INF/MANIFEST.MF
    directory/sandbox/felixk/studio-ldapbrowser-ui/pom.xml
    directory/sandbox/felixk/studio-ldifeditor-help/pom.xml
    directory/sandbox/felixk/studio-ldifeditor/META-INF/MANIFEST.MF
    directory/sandbox/felixk/studio-ldifeditor/pom.xml
    directory/sandbox/felixk/studio-rcp-help/pom.xml
    directory/sandbox/felixk/studio-rcp/pom.xml
    directory/sandbox/felixk/studio-schemaeditor-help/pom.xml
    directory/sandbox/felixk/studio-schemaeditor/pom.xml
    directory/sandbox/felixk/studio-valueeditors/META-INF/MANIFEST.MF
    directory/sandbox/felixk/studio-valueeditors/pom.xml
    directory/sandbox/felixk/studio/pom.xml

Modified: directory/sandbox/felixk/studio-aciitemeditor/META-INF/MANIFEST.MF
URL: http://svn.apache.org/viewvc/directory/sandbox/felixk/studio-aciitemeditor/META-INF/MANIFEST.MF?rev=598090&r1=598089&r2=598090&view=diff
==============================================================================
--- directory/sandbox/felixk/studio-aciitemeditor/META-INF/MANIFEST.MF (original)
+++ directory/sandbox/felixk/studio-aciitemeditor/META-INF/MANIFEST.MF Sun Nov 25 15:22:14 2007
@@ -19,13 +19,4 @@
  org.apache.directory.studio.valueeditors,
  org.apache.directory.studio.ldapbrowser.common
 Eclipse-LazyStart: true
-Bundle-ClassPath: .,
- antlr-2.7.7.jar,
- commons-codec-1.3.jar,
- commons-collections-3.2.jar,
- commons-io-1.3.1.jar,
- commons-lang-2.1.jar,
- shared-asn1-0.9.7-SNAPSHOT.jar,
- shared-ldap-0.9.7-SNAPSHOT.jar,
- shared-ldap-constants-0.9.7-SNAPSHOT.jar,
- poi-3.0.1-FINAL.jar
+Bundle-ClassPath: .

Modified: directory/sandbox/felixk/studio-aciitemeditor/pom.xml
URL: http://svn.apache.org/viewvc/directory/sandbox/felixk/studio-aciitemeditor/pom.xml?rev=598090&r1=598089&r2=598090&view=diff
==============================================================================
--- directory/sandbox/felixk/studio-aciitemeditor/pom.xml (original)
+++ directory/sandbox/felixk/studio-aciitemeditor/pom.xml Sun Nov 25 15:22:14 2007
@@ -76,39 +76,6 @@
       </plugin>
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-dependency-plugin</artifactId>
-        <executions>
-          <execution>
-            <id>copy-dependencies</id>
-            <phase>process-sources</phase>
-            <goals>
-              <goal>copy-dependencies</goal>
-            </goals>
-            <configuration>
-              <outputDirectory>${basedir}</outputDirectory>
-              <overWriteReleases>false</overWriteReleases>
-              <overWriteSnapshots>false</overWriteSnapshots>
-              <overWriteIfNewer>true</overWriteIfNewer>
-            </configuration>
-          </execution>
-        </executions>
-      </plugin>
-      <plugin>
-        <artifactId>maven-clean-plugin</artifactId>
-        <configuration>
-          <filesets>
-            <fileset>
-              <directory>${basedir}</directory>
-              <includes>
-                <include>*.jar</include>
-              </includes>
-              <followSymlinks>false</followSymlinks>
-            </fileset>
-          </filesets>
-        </configuration>
-      </plugin>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-jar-plugin</artifactId>
         <configuration>
           <archive>
@@ -124,66 +91,82 @@
     <dependency>
       <groupId>org.apache.directory.shared</groupId>
       <artifactId>shared-ldap</artifactId>
+      <scope>provided</scope>
     </dependency>
     <dependency>
       <groupId>org.apache.directory.studio</groupId>
       <artifactId>${pom.groupId}.ldapbrowser.common</artifactId>
+      <scope>provided</scope>
     </dependency>
     <dependency>
       <groupId>org.apache.directory.studio</groupId>
       <artifactId>${pom.groupId}.connection.core</artifactId>
+      <scope>provided</scope>
     </dependency>
     <dependency>
       <groupId>org.apache.directory.studio</groupId>
       <artifactId>${pom.groupId}.ldapbrowser.core</artifactId>
+      <scope>provided</scope>
     </dependency>
     <dependency>
       <groupId>org.apache.directory.studio</groupId>
       <artifactId>${pom.groupId}.valueeditors</artifactId>
+      <scope>provided</scope>
     </dependency>
     <dependency>
       <groupId>org.eclipse</groupId>
       <artifactId>org.eclipse.core.commands</artifactId>
+      <scope>provided</scope>
     </dependency>
     <dependency>
       <groupId>org.eclipse</groupId>
       <artifactId>org.eclipse.jface</artifactId>
+      <scope>provided</scope>
     </dependency>
     <dependency>
       <groupId>org.eclipse</groupId>
       <artifactId>org.eclipse.jface.text</artifactId>
+      <scope>provided</scope>
     </dependency>
     <dependency>
       <groupId>org.eclipse</groupId>
       <artifactId>${swt.platformrelated.artifactId}</artifactId>
+      <scope>provided</scope>
     </dependency>
     <dependency>
       <groupId>org.eclipse</groupId>
       <artifactId>org.eclipse.osgi</artifactId>
+      <scope>provided</scope>
     </dependency>
     <dependency>
       <groupId>org.eclipse</groupId>
       <artifactId>org.eclipse.equinox.common</artifactId>
+      <scope>provided</scope>
     </dependency>
     <dependency>
       <groupId>org.eclipse</groupId>
       <artifactId>org.eclipse.core.runtime</artifactId>
+      <scope>provided</scope>
     </dependency>
     <dependency>
       <groupId>org.eclipse</groupId>
       <artifactId>org.eclipse.text</artifactId>
+      <scope>provided</scope>
     </dependency>
     <dependency>
       <groupId>org.eclipse</groupId>
       <artifactId>org.eclipse.ui.editors</artifactId>
+      <scope>provided</scope>
     </dependency>
     <dependency>
       <groupId>org.eclipse</groupId>
       <artifactId>org.eclipse.ui.workbench</artifactId>
+      <scope>provided</scope>
     </dependency>
     <dependency>
       <groupId>org.eclipse</groupId>
       <artifactId>org.eclipse.ui.workbench.texteditor</artifactId>
+      <scope>provided</scope>
     </dependency>
   </dependencies>
 </project>

Modified: directory/sandbox/felixk/studio-apacheds-configuration-help/pom.xml
URL: http://svn.apache.org/viewvc/directory/sandbox/felixk/studio-apacheds-configuration-help/pom.xml?rev=598090&r1=598089&r2=598090&view=diff
==============================================================================
--- directory/sandbox/felixk/studio-apacheds-configuration-help/pom.xml (original)
+++ directory/sandbox/felixk/studio-apacheds-configuration-help/pom.xml Sun Nov 25 15:22:14 2007
@@ -210,7 +210,7 @@
                 <artifactId>maven-dependency-plugin</artifactId>
                 <executions>
                     <execution>
-                        <id>unpack</id>
+                        <id>unpack-apacheds-configuration-help</id>
                         <phase>process-resources</phase>
                         <goals>
                             <goal>unpack</goal>
@@ -240,7 +240,7 @@
                 <artifactId>maven-antrun-plugin</artifactId>
                 <executions>
                     <execution>
-                        <id>build-eclipse-help</id>
+                        <id>build-eclipse-help-apacheds-configuration</id>
                         <phase>compile</phase>
                         <configuration>
                             <tasks>

Modified: directory/sandbox/felixk/studio-apacheds-configuration/META-INF/MANIFEST.MF
URL: http://svn.apache.org/viewvc/directory/sandbox/felixk/studio-apacheds-configuration/META-INF/MANIFEST.MF?rev=598090&r1=598089&r2=598090&view=diff
==============================================================================
--- directory/sandbox/felixk/studio-apacheds-configuration/META-INF/MANIFEST.MF (original)
+++ directory/sandbox/felixk/studio-apacheds-configuration/META-INF/MANIFEST.MF Sun Nov 25 15:22:14 2007
@@ -10,13 +10,8 @@
 Require-Bundle: org.eclipse.core.runtime,
  org.eclipse.ui,
  org.eclipse.ui.forms,
- org.apache.directory.studio.jars
-Bundle-ClassPath: .,
- antlr-2.7.7.jar,
- commons-collections-3.2.jar,
- commons-lang-2.1.jar,
- dom4j-1.6.1.jar,
- shared-asn1-0.9.7-SNAPSHOT.jar,
- shared-ldap-0.9.7-SNAPSHOT.jar,
- shared-ldap-constants-0.9.7-SNAPSHOT.jar,
- xml-apis-1.0.b2.jar
+ org.apache.directory.studio.jars,
+ org.eclipse.jface.text,
+ org.eclipse.ui.ide,
+ org.eclipse.core.resources
+Bundle-ClassPath: .

Modified: directory/sandbox/felixk/studio-apacheds-configuration/pom.xml
URL: http://svn.apache.org/viewvc/directory/sandbox/felixk/studio-apacheds-configuration/pom.xml?rev=598090&r1=598089&r2=598090&view=diff
==============================================================================
--- directory/sandbox/felixk/studio-apacheds-configuration/pom.xml (original)
+++ directory/sandbox/felixk/studio-apacheds-configuration/pom.xml Sun Nov 25 15:22:14 2007
@@ -74,39 +74,6 @@
       </plugin>
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-dependency-plugin</artifactId>
-        <executions>
-          <execution>
-            <id>copy-dependencies</id>
-            <phase>process-sources</phase>
-            <goals>
-              <goal>copy-dependencies</goal>
-            </goals>
-            <configuration>
-              <outputDirectory>${basedir}</outputDirectory>
-              <overWriteReleases>false</overWriteReleases>
-              <overWriteSnapshots>false</overWriteSnapshots>
-              <overWriteIfNewer>true</overWriteIfNewer>
-            </configuration>
-          </execution>
-        </executions>
-      </plugin>
-      <plugin>
-        <artifactId>maven-clean-plugin</artifactId>
-        <configuration>
-          <filesets>
-            <fileset>
-              <directory>${basedir}</directory>
-              <includes>
-                <include>*.jar</include>
-              </includes>
-              <followSymlinks>false</followSymlinks>
-            </fileset>
-          </filesets>
-        </configuration>
-      </plugin>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-jar-plugin</artifactId>
         <configuration>
           <archive>
@@ -122,50 +89,62 @@
     <dependency>
       <groupId>org.eclipse</groupId>
       <artifactId>${swt.platformrelated.artifactId}</artifactId>
+      <scope>provided</scope>
     </dependency>
     <dependency>
       <groupId>org.eclipse</groupId>
       <artifactId>org.eclipse.jface</artifactId>
+      <scope>provided</scope>
     </dependency>
     <dependency>
       <groupId>org.eclipse</groupId>
       <artifactId>org.eclipse.ui.forms</artifactId>
+      <scope>provided</scope>
     </dependency>
     <dependency>
       <groupId>org.eclipse</groupId>
       <artifactId>org.eclipse.ui.workbench</artifactId>
+      <scope>provided</scope>
     </dependency>
     <dependency>
       <groupId>org.eclipse</groupId>
       <artifactId>org.eclipse.core.runtime</artifactId>
+      <scope>provided</scope>
     </dependency>
     <dependency>
       <groupId>org.eclipse</groupId>
       <artifactId>org.eclipse.equinox.common</artifactId>
+      <scope>provided</scope>
     </dependency>
     <dependency>
       <groupId>org.eclipse</groupId>
       <artifactId>org.eclipse.equinox.registry</artifactId>
+      <scope>provided</scope>
     </dependency>
     <dependency>
       <groupId>org.eclipse</groupId>
       <artifactId>org.eclipse.core.commands</artifactId>
+      <scope>provided</scope>
     </dependency>
     <dependency>
       <groupId>org.eclipse</groupId>
       <artifactId>org.eclipse.osgi</artifactId>
+      <scope>provided</scope>
     </dependency>
     <dependency>
       <groupId>dom4j</groupId>
       <artifactId>dom4j</artifactId>
+      <scope>provided</scope>
     </dependency>
     <dependency>
       <groupId>org.apache.directory.shared</groupId>
       <artifactId>shared-ldap</artifactId>
+      <scope>provided</scope>
     </dependency>
     <dependency>
       <groupId>org.apache.directory.shared</groupId>
       <artifactId>shared-ldap</artifactId>
+      <scope>provided</scope>
     </dependency>
   </dependencies>
 </project>

Modified: directory/sandbox/felixk/studio-connection-core/META-INF/MANIFEST.MF
URL: http://svn.apache.org/viewvc/directory/sandbox/felixk/studio-connection-core/META-INF/MANIFEST.MF?rev=598090&r1=598089&r2=598090&view=diff
==============================================================================
--- directory/sandbox/felixk/studio-connection-core/META-INF/MANIFEST.MF (original)
+++ directory/sandbox/felixk/studio-connection-core/META-INF/MANIFEST.MF Sun Nov 25 15:22:14 2007
@@ -7,7 +7,8 @@
 Bundle-Vendor: The Apache Software Foundation
 Bundle-Localization: plugin
 Require-Bundle: org.eclipse.core.runtime,
- org.apache.directory.studio.jars
+ org.apache.directory.studio.jars,
+ org.apache.directory.studio.ldifparser
 Eclipse-LazyStart: true
 Export-Package: org.apache.directory.studio.connection.core,
  org.apache.directory.studio.connection.core.event,

Modified: directory/sandbox/felixk/studio-connection-core/pom.xml
URL: http://svn.apache.org/viewvc/directory/sandbox/felixk/studio-connection-core/pom.xml?rev=598090&r1=598089&r2=598090&view=diff
==============================================================================
--- directory/sandbox/felixk/studio-connection-core/pom.xml (original)
+++ directory/sandbox/felixk/studio-connection-core/pom.xml Sun Nov 25 15:22:14 2007
@@ -66,7 +66,7 @@
         <artifactId>maven-dependency-plugin</artifactId>
         <executions>
           <execution>
-            <id>copy</id>
+            <id>copy-connection-core</id>
             <phase>compile</phase>
             <goals>
               <goal>copy-dependencies</goal>
@@ -75,19 +75,6 @@
               <overWrite>true</overWrite>
               <outputDirectory>target/classes</outputDirectory>
               <excludeScope>provided</excludeScope>
-            </configuration>
-          </execution>
-          <execution>
-            <id>copy-dependencies</id>
-            <phase>process-sources</phase>
-            <goals>
-              <goal>copy-dependencies</goal>
-            </goals>
-            <configuration>
-              <outputDirectory>${basedir}</outputDirectory>
-              <overWriteReleases>false</overWriteReleases>
-              <overWriteSnapshots>false</overWriteSnapshots>
-              <overWriteIfNewer>true</overWriteIfNewer>
             </configuration>
           </execution>
         </executions>

Modified: directory/sandbox/felixk/studio-connection-ui/META-INF/MANIFEST.MF
URL: http://svn.apache.org/viewvc/directory/sandbox/felixk/studio-connection-ui/META-INF/MANIFEST.MF?rev=598090&r1=598089&r2=598090&view=diff
==============================================================================
--- directory/sandbox/felixk/studio-connection-ui/META-INF/MANIFEST.MF (original)
+++ directory/sandbox/felixk/studio-connection-ui/META-INF/MANIFEST.MF Sun Nov 25 15:22:14 2007
@@ -8,14 +8,15 @@
 Bundle-Localization: plugin
 Require-Bundle: org.eclipse.ui,
  org.eclipse.core.runtime,
+ org.apache.directory.studio.jars,
  org.apache.directory.studio.connection.core,
  org.eclipse.ui.workbench.texteditor
 Eclipse-LazyStart: true
 Export-Package: org.apache.directory.studio.connection.ui,
  org.apache.directory.studio.connection.ui.actions,
+ org.apache.directory.studio.connection.ui.dialogs,
  org.apache.directory.studio.connection.ui.dnd,
  org.apache.directory.studio.connection.ui.properties,
  org.apache.directory.studio.connection.ui.widgets,
  org.apache.directory.studio.connection.ui.wizards
-Bundle-ClassPath: .,
- commons-io-1.3.1.jar
+Bundle-ClassPath: .

Modified: directory/sandbox/felixk/studio-connection-ui/pom.xml
URL: http://svn.apache.org/viewvc/directory/sandbox/felixk/studio-connection-ui/pom.xml?rev=598090&r1=598089&r2=598090&view=diff
==============================================================================
--- directory/sandbox/felixk/studio-connection-ui/pom.xml (original)
+++ directory/sandbox/felixk/studio-connection-ui/pom.xml Sun Nov 25 15:22:14 2007
@@ -72,39 +72,6 @@
       </plugin>
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-dependency-plugin</artifactId>
-        <executions>
-          <execution>
-            <id>copy-dependencies</id>
-            <phase>process-sources</phase>
-            <goals>
-              <goal>copy-dependencies</goal>
-            </goals>
-            <configuration>
-              <outputDirectory>${basedir}</outputDirectory>
-              <overWriteReleases>false</overWriteReleases>
-              <overWriteSnapshots>false</overWriteSnapshots>
-              <overWriteIfNewer>true</overWriteIfNewer>
-            </configuration>
-          </execution>
-        </executions>
-      </plugin>
-      <plugin>
-        <artifactId>maven-clean-plugin</artifactId>
-        <configuration>
-          <filesets>
-            <fileset>
-              <directory>${basedir}</directory>
-              <includes>
-                <include>*.jar</include>
-              </includes>
-              <followSymlinks>false</followSymlinks>
-            </fileset>
-          </filesets>
-        </configuration>
-      </plugin>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-jar-plugin</artifactId>
         <configuration>
           <archive>
@@ -120,54 +87,67 @@
     <dependency>
       <groupId>org.eclipse</groupId>
       <artifactId>${swt.platformrelated.artifactId}</artifactId>
+      <scope>provided</scope>
     </dependency>
     <dependency>
       <groupId>org.eclipse</groupId>
       <artifactId>org.eclipse.ui.workbench</artifactId>
+      <scope>provided</scope>
     </dependency>
     <dependency>
       <groupId>org.eclipse</groupId>
       <artifactId>org.eclipse.core.commands</artifactId>
+      <scope>provided</scope>
     </dependency>
     <dependency>
       <groupId>org.eclipse</groupId>
       <artifactId>org.eclipse.core.runtime</artifactId>
+      <scope>provided</scope>
     </dependency>
     <dependency>
       <groupId>org.eclipse</groupId>
       <artifactId>org.eclipse.core.jobs</artifactId>
+      <scope>provided</scope>
     </dependency>
     <dependency>
       <groupId>org.eclipse</groupId>
       <artifactId>org.eclipse.equinox.registry</artifactId>
+      <scope>provided</scope>
     </dependency>
     <dependency>
       <groupId>org.eclipse</groupId>
       <artifactId>org.eclipse.equinox.common</artifactId>
+      <scope>provided</scope>
     </dependency>
     <dependency>
       <groupId>org.eclipse</groupId>
       <artifactId>org.eclipse.osgi</artifactId>
+      <scope>provided</scope>
     </dependency>
     <dependency>
       <groupId>org.eclipse</groupId>
       <artifactId>org.eclipse.ui.workbench.texteditor</artifactId>
+      <scope>provided</scope>
     </dependency>
     <dependency>
       <groupId>org.eclipse</groupId>
       <artifactId>org.eclipse.jface</artifactId>
+      <scope>provided</scope>
     </dependency>
     <dependency>
       <groupId>org.eclipse</groupId>
       <artifactId>org.eclipse.ui</artifactId>
+      <scope>provided</scope>
     </dependency>
     <dependency>
       <groupId>org.eclipse</groupId>
       <artifactId>org.eclipse.ui.editors</artifactId>
+      <scope>provided</scope>
     </dependency>
     <dependency>
       <groupId>org.apache.directory.studio</groupId>
       <artifactId>${pom.groupId}.connection.core</artifactId>
+      <scope>provided</scope>
     </dependency>
   </dependencies>
 </project>

Modified: directory/sandbox/felixk/studio-jars/pom.xml
URL: http://svn.apache.org/viewvc/directory/sandbox/felixk/studio-jars/pom.xml?rev=598090&r1=598089&r2=598090&view=diff
==============================================================================
--- directory/sandbox/felixk/studio-jars/pom.xml (original)
+++ directory/sandbox/felixk/studio-jars/pom.xml Sun Nov 25 15:22:14 2007
@@ -57,7 +57,7 @@
         <artifactId>maven-dependency-plugin</artifactId>
         <executions>
           <execution>
-            <id>copy</id>
+            <id>copy-jars</id>
             <phase>compile</phase>
             <goals>
               <goal>copy-dependencies</goal>
@@ -68,19 +68,6 @@
               <excludeScope>provided</excludeScope>
             </configuration>
           </execution>
-          <execution>
-            <id>copy-dependencies</id>
-            <phase>process-sources</phase>
-            <goals>
-              <goal>copy-dependencies</goal>
-            </goals>
-            <configuration>
-              <outputDirectory>${basedir}</outputDirectory>
-              <overWriteReleases>false</overWriteReleases>
-              <overWriteSnapshots>false</overWriteSnapshots>
-              <overWriteIfNewer>true</overWriteIfNewer>
-            </configuration>
-          </execution>
         </executions>
       </plugin>
       <plugin>
@@ -166,6 +153,12 @@
     <dependency>
       <groupId>org.apache.directory.studio</groupId>
       <artifactId>studio-dsml-parser</artifactId>
+      <exclusions>
+        <exclusion>
+          <groupId>junit</groupId>
+          <artifactId>junit</artifactId>
+        </exclusion>
+      </exclusions>
     </dependency>
     <dependency>
       <groupId>xpp3</groupId>

Modified: directory/sandbox/felixk/studio-ldapbrowser-common/META-INF/MANIFEST.MF
URL: http://svn.apache.org/viewvc/directory/sandbox/felixk/studio-ldapbrowser-common/META-INF/MANIFEST.MF?rev=598090&r1=598089&r2=598090&view=diff
==============================================================================
--- directory/sandbox/felixk/studio-ldapbrowser-common/META-INF/MANIFEST.MF (original)
+++ directory/sandbox/felixk/studio-ldapbrowser-common/META-INF/MANIFEST.MF Sun Nov 25 15:22:14 2007
@@ -12,6 +12,7 @@
  org.eclipse.ui.workbench.texteditor,
  org.eclipse.ui.editors,
  org.apache.directory.studio.jars,
+ org.apache.directory.studio.ldifparser,
  org.apache.directory.studio.connection.core,
  org.apache.directory.studio.connection.ui,
  org.apache.directory.studio.ldapbrowser.core
@@ -31,13 +32,4 @@
  org.apache.directory.studio.ldapbrowser.common.widgets.search,
  org.apache.directory.studio.ldapbrowser.common.wizards,
  org.apache.directory.studio.valueeditors
-Bundle-ClassPath: .,
- antlr-2.7.7.jar,
- commons-codec-1.3.jar,
- commons-collections-3.2.jar,
- commons-io-1.3.1.jar,
- commons-lang-2.1.jar,
- shared-asn1-0.9.7-SNAPSHOT.jar,
- shared-ldap-0.9.7-SNAPSHOT.jar,
- shared-ldap-constants-0.9.7-SNAPSHOT.jar,
- poi-3.0.1-FINAL.jar
+Bundle-ClassPath: .

Modified: directory/sandbox/felixk/studio-ldapbrowser-common/pom.xml
URL: http://svn.apache.org/viewvc/directory/sandbox/felixk/studio-ldapbrowser-common/pom.xml?rev=598090&r1=598089&r2=598090&view=diff
==============================================================================
--- directory/sandbox/felixk/studio-ldapbrowser-common/pom.xml (original)
+++ directory/sandbox/felixk/studio-ldapbrowser-common/pom.xml Sun Nov 25 15:22:14 2007
@@ -68,39 +68,6 @@
                 </configuration>
             </plugin>
             <plugin>
-              <groupId>org.apache.maven.plugins</groupId>
-              <artifactId>maven-dependency-plugin</artifactId>
-              <executions>
-                <execution>
-                  <id>copy-dependencies</id>
-                  <phase>process-sources</phase>
-                  <goals>
-                    <goal>copy-dependencies</goal>
-                  </goals>
-                  <configuration>
-                    <outputDirectory>${basedir}</outputDirectory>
-                    <overWriteReleases>false</overWriteReleases>
-                    <overWriteSnapshots>false</overWriteSnapshots>
-                    <overWriteIfNewer>true</overWriteIfNewer>
-                  </configuration>
-                </execution>
-              </executions>
-            </plugin>
-            <plugin>
-              <artifactId>maven-clean-plugin</artifactId>
-              <configuration>
-                <filesets>
-                  <fileset>
-                    <directory>${basedir}</directory>
-                    <includes>
-                      <include>*.jar</include>
-                    </includes>
-                    <followSymlinks>false</followSymlinks>
-                  </fileset>
-                </filesets>
-              </configuration>
-            </plugin>
-            <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-jar-plugin</artifactId>
                 <configuration>
@@ -117,78 +84,97 @@
         <dependency>
             <groupId>org.eclipse</groupId>
             <artifactId>org.eclipse.jface</artifactId>
+            <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>org.eclipse</groupId>
             <artifactId>org.eclipse.jface.text</artifactId>
+            <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>org.eclipse</groupId>
             <artifactId>org.eclipse.text</artifactId>
+            <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>org.eclipse</groupId>
             <artifactId>org.eclipse.ui.workbench.texteditor</artifactId>
+            <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>org.eclipse</groupId>
             <artifactId>org.eclipse.ui.workbench</artifactId>
+            <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>org.eclipse</groupId>
             <artifactId>org.eclipse.ui.editors</artifactId>
+            <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>org.eclipse</groupId>
             <artifactId>org.eclipse.core.commands</artifactId>
+            <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>org.eclipse</groupId>
             <artifactId>org.eclipse.core.jobs</artifactId>
+            <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>org.eclipse</groupId>
             <artifactId>org.eclipse.core.runtime</artifactId>
+            <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>org.eclipse</groupId>
             <artifactId>org.eclipse.update.core</artifactId>
+            <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>org.eclipse</groupId>
             <artifactId>org.eclipse.osgi</artifactId>
+            <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>org.eclipse</groupId>
             <artifactId>org.eclipse.equinox.common</artifactId>
+            <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>org.eclipse</groupId>
             <artifactId>org.eclipse.equinox.registry</artifactId>
+            <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>org.eclipse</groupId>
             <artifactId>org.eclipse.equinox.preferences</artifactId>
+            <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>org.eclipse</groupId>
             <artifactId>${swt.platformrelated.artifactId}</artifactId>
+            <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>org.apache.directory.shared</groupId>
             <artifactId>shared-ldap</artifactId>
+            <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>org.apache.directory.studio</groupId>
             <artifactId>${pom.groupId}.connection.core</artifactId>
+            <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>org.apache.directory.studio</groupId>
             <artifactId>${pom.groupId}.ldapbrowser.core</artifactId>
+            <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>org.apache.directory.studio</groupId>
             <artifactId>${pom.groupId}.connection.ui</artifactId>
+            <scope>provided</scope>
         </dependency>
     </dependencies>
 </project>

Modified: directory/sandbox/felixk/studio-ldapbrowser-core/META-INF/MANIFEST.MF
URL: http://svn.apache.org/viewvc/directory/sandbox/felixk/studio-ldapbrowser-core/META-INF/MANIFEST.MF?rev=598090&r1=598089&r2=598090&view=diff
==============================================================================
--- directory/sandbox/felixk/studio-ldapbrowser-core/META-INF/MANIFEST.MF (original)
+++ directory/sandbox/felixk/studio-ldapbrowser-core/META-INF/MANIFEST.MF Sun Nov 25 15:22:14 2007
@@ -9,6 +9,7 @@
 Require-Bundle: org.eclipse.core.runtime,
  org.eclipse.search,
  org.apache.directory.studio.jars,
+ org.apache.directory.studio.ldifparser,
  org.apache.directory.studio.connection.core
 Eclipse-LazyStart: true
 Export-Package: org.apache.directory.studio.ldapbrowser.core,
@@ -19,10 +20,6 @@
  org.apache.directory.studio.ldapbrowser.core.model.filter,
  org.apache.directory.studio.ldapbrowser.core.model.filter.parser,
  org.apache.directory.studio.ldapbrowser.core.model.impl,
- org.apache.directory.studio.ldapbrowser.core.model.ldif,
- org.apache.directory.studio.ldapbrowser.core.model.ldif.container,
- org.apache.directory.studio.ldapbrowser.core.model.ldif.lines,
- org.apache.directory.studio.ldapbrowser.core.model.ldif.parser,
  org.apache.directory.studio.ldapbrowser.core.model.schema,
  org.apache.directory.studio.ldapbrowser.core.model.schema.parser,
  org.apache.directory.studio.ldapbrowser.core.propertypageproviders,

Modified: directory/sandbox/felixk/studio-ldapbrowser-core/pom.xml
URL: http://svn.apache.org/viewvc/directory/sandbox/felixk/studio-ldapbrowser-core/pom.xml?rev=598090&r1=598089&r2=598090&view=diff
==============================================================================
--- directory/sandbox/felixk/studio-ldapbrowser-core/pom.xml (original)
+++ directory/sandbox/felixk/studio-ldapbrowser-core/pom.xml Sun Nov 25 15:22:14 2007
@@ -68,7 +68,7 @@
         <artifactId>maven-dependency-plugin</artifactId>
         <executions>
           <execution>
-            <id>copy</id>
+            <id>copy-ldapbrowser-core</id>
             <phase>compile</phase>
             <goals>
               <goal>copy-dependencies</goal>
@@ -77,19 +77,6 @@
               <overWrite>true</overWrite>
               <outputDirectory>target/classes</outputDirectory>
               <excludeScope>provided</excludeScope>
-            </configuration>
-          </execution>
-          <execution>
-            <id>copy-dependencies</id>
-            <phase>process-sources</phase>
-            <goals>
-              <goal>copy-dependencies</goal>
-            </goals>
-            <configuration>
-              <outputDirectory>${basedir}</outputDirectory>
-              <overWriteReleases>false</overWriteReleases>
-              <overWriteSnapshots>false</overWriteSnapshots>
-              <overWriteIfNewer>true</overWriteIfNewer>
             </configuration>
           </execution>
         </executions>

Modified: directory/sandbox/felixk/studio-ldapbrowser-help/pom.xml
URL: http://svn.apache.org/viewvc/directory/sandbox/felixk/studio-ldapbrowser-help/pom.xml?rev=598090&r1=598089&r2=598090&view=diff
==============================================================================
--- directory/sandbox/felixk/studio-ldapbrowser-help/pom.xml (original)
+++ directory/sandbox/felixk/studio-ldapbrowser-help/pom.xml Sun Nov 25 15:22:14 2007
@@ -210,7 +210,7 @@
                 <artifactId>maven-dependency-plugin</artifactId>
                 <executions>
                     <execution>
-                        <id>unpack</id>
+                        <id>unpack-ldapbrowser-help</id>
                         <phase>process-resources</phase>
                         <goals>
                             <goal>unpack</goal>
@@ -240,7 +240,7 @@
                 <artifactId>maven-antrun-plugin</artifactId>
                 <executions>
                     <execution>
-                        <id>build-eclipse-help</id>
+                        <id>build-eclipse-help-ldapbrowser-help</id>
                         <phase>process-classes</phase>
                         <configuration>
                             <tasks>

Modified: directory/sandbox/felixk/studio-ldapbrowser-ui/META-INF/MANIFEST.MF
URL: http://svn.apache.org/viewvc/directory/sandbox/felixk/studio-ldapbrowser-ui/META-INF/MANIFEST.MF?rev=598090&r1=598089&r2=598090&view=diff
==============================================================================
--- directory/sandbox/felixk/studio-ldapbrowser-ui/META-INF/MANIFEST.MF (original)
+++ directory/sandbox/felixk/studio-ldapbrowser-ui/META-INF/MANIFEST.MF Sun Nov 25 15:22:14 2007
@@ -16,19 +16,11 @@
  org.eclipse.ui.forms,
  org.eclipse.jface.text,
  org.apache.directory.studio.jars,
+ org.apache.directory.studio.ldifparser,
  org.apache.directory.studio.connection.core,
  org.apache.directory.studio.connection.ui,
  org.apache.directory.studio.ldapbrowser.core,
  org.apache.directory.studio.ldapbrowser.common,
  org.apache.directory.studio.ldifeditor
 Eclipse-LazyStart: true
-Bundle-ClassPath: .,
- antlr-2.7.7.jar,
- commons-codec-1.3.jar,
- commons-collections-3.2.jar,
- commons-io-1.3.1.jar,
- commons-lang-2.1.jar,
- shared-asn1-0.9.7-SNAPSHOT.jar,
- shared-ldap-0.9.7-SNAPSHOT.jar,
- shared-ldap-constants-0.9.7-SNAPSHOT.jar,
- poi-3.0.1-FINAL.jar
+Bundle-ClassPath: .

Modified: directory/sandbox/felixk/studio-ldapbrowser-ui/pom.xml
URL: http://svn.apache.org/viewvc/directory/sandbox/felixk/studio-ldapbrowser-ui/pom.xml?rev=598090&r1=598089&r2=598090&view=diff
==============================================================================
--- directory/sandbox/felixk/studio-ldapbrowser-ui/pom.xml (original)
+++ directory/sandbox/felixk/studio-ldapbrowser-ui/pom.xml Sun Nov 25 15:22:14 2007
@@ -79,39 +79,6 @@
       </plugin>
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-dependency-plugin</artifactId>
-        <executions>
-          <execution>
-            <id>copy-dependencies</id>
-            <phase>process-sources</phase>
-            <goals>
-              <goal>copy-dependencies</goal>
-            </goals>
-            <configuration>
-              <outputDirectory>${basedir}</outputDirectory>
-              <overWriteReleases>false</overWriteReleases>
-              <overWriteSnapshots>false</overWriteSnapshots>
-              <overWriteIfNewer>true</overWriteIfNewer>
-            </configuration>
-          </execution>
-        </executions>
-      </plugin>
-      <plugin>
-        <artifactId>maven-clean-plugin</artifactId>
-        <configuration>
-          <filesets>
-            <fileset>
-              <directory>${basedir}</directory>
-              <includes>
-                <include>*.jar</include>
-              </includes>
-              <followSymlinks>false</followSymlinks>
-            </fileset>
-          </filesets>
-        </configuration>
-      </plugin>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-jar-plugin</artifactId>
         <configuration>
           <archive>
@@ -127,94 +94,122 @@
     <dependency>
       <groupId>org.apache.directory.studio</groupId>
       <artifactId>${pom.groupId}.ldapbrowser.common</artifactId>
+      <scope>provided</scope>
     </dependency>
     <dependency>
       <groupId>org.apache.directory.shared</groupId>
       <artifactId>shared-ldap</artifactId>
+      <scope>provided</scope>
     </dependency>
     <dependency>
       <groupId>org.apache.directory.studio</groupId>
       <artifactId>${pom.groupId}.ldapbrowser.core</artifactId>
+      <scope>provided</scope>
     </dependency>
     <dependency>
       <groupId>org.apache.directory.studio</groupId>
       <artifactId>${pom.groupId}.connection.ui</artifactId>
+      <scope>provided</scope>
     </dependency>
     <dependency>
       <groupId>org.apache.directory.studio</groupId>
       <artifactId>${pom.groupId}.connection.core</artifactId>
+      <scope>provided</scope>
     </dependency>
     <dependency>
       <groupId>org.apache.directory.studio</groupId>
       <artifactId>${pom.groupId}.ldifeditor</artifactId>
+      <scope>provided</scope>
     </dependency>
     <dependency>
       <groupId>org.eclipse</groupId>
       <artifactId>org.eclipse.core.commands</artifactId>
+      <scope>provided</scope>
     </dependency>
     <dependency>
       <groupId>org.eclipse</groupId>
       <artifactId>org.eclipse.osgi</artifactId>
+      <scope>provided</scope>
     </dependency>
     <dependency>
       <groupId>org.eclipse</groupId>
       <artifactId>org.eclipse.core.jobs</artifactId>
+      <scope>provided</scope>
     </dependency>
     <dependency>
       <groupId>org.eclipse</groupId>
       <artifactId>org.eclipse.equinox.preferences</artifactId>
+      <scope>provided</scope>
     </dependency>
     <dependency>
       <groupId>org.eclipse</groupId>
       <artifactId>org.eclipse.search</artifactId>
+      <scope>provided</scope>
     </dependency>
     <dependency>
       <groupId>org.eclipse</groupId>
       <artifactId>org.eclipse.equinox.common</artifactId>
+      <scope>provided</scope>
     </dependency>
     <dependency>
       <groupId>org.eclipse</groupId>
       <artifactId>org.eclipse.core.runtime</artifactId>
+      <scope>provided</scope>
     </dependency>
     <dependency>
       <groupId>org.eclipse</groupId>
       <artifactId>org.eclipse.equinox.registry</artifactId>
+      <scope>provided</scope>
     </dependency>
     <dependency>
       <groupId>org.eclipse</groupId>
       <artifactId>org.eclipse.jface</artifactId>
+      <scope>provided</scope>
     </dependency>
     <dependency>
       <groupId>org.eclipse</groupId>
       <artifactId>org.eclipse.jface.text</artifactId>
+      <scope>provided</scope>
     </dependency>
     <dependency>
       <groupId>org.eclipse</groupId>
       <artifactId>org.eclipse.text</artifactId>
+      <scope>provided</scope>
     </dependency>
     <dependency>
       <groupId>org.eclipse</groupId>
       <artifactId>org.eclipse.ui.editors</artifactId>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.eclipse</groupId>
+      <artifactId>org.eclipse.ui.ide</artifactId>
+      <scope>provided</scope>
     </dependency>
     <dependency>
       <groupId>org.eclipse</groupId>
       <artifactId>org.eclipse.ui.forms</artifactId>
+      <scope>provided</scope>
     </dependency>
     <dependency>
       <groupId>org.eclipse</groupId>
       <artifactId>org.eclipse.ui.views</artifactId>
+      <scope>provided</scope>
     </dependency>
     <dependency>
       <groupId>org.eclipse</groupId>
       <artifactId>org.eclipse.ui.workbench</artifactId>
+      <scope>provided</scope>
     </dependency>
     <dependency>
       <groupId>org.eclipse</groupId>
       <artifactId>org.eclipse.ui.workbench.texteditor</artifactId>
+      <scope>provided</scope>
     </dependency>
     <dependency>
       <groupId>org.eclipse</groupId>
       <artifactId>${swt.platformrelated.artifactId}</artifactId>
+      <scope>provided</scope>
     </dependency>
   </dependencies>
 </project>

Modified: directory/sandbox/felixk/studio-ldifeditor-help/pom.xml
URL: http://svn.apache.org/viewvc/directory/sandbox/felixk/studio-ldifeditor-help/pom.xml?rev=598090&r1=598089&r2=598090&view=diff
==============================================================================
--- directory/sandbox/felixk/studio-ldifeditor-help/pom.xml (original)
+++ directory/sandbox/felixk/studio-ldifeditor-help/pom.xml Sun Nov 25 15:22:14 2007
@@ -210,7 +210,7 @@
                 <artifactId>maven-dependency-plugin</artifactId>
                 <executions>
                     <execution>
-                        <id>unpack</id>
+                        <id>unpack-ldifeditor-help</id>
                         <phase>process-resources</phase>
                         <goals>
                             <goal>unpack</goal>
@@ -240,7 +240,7 @@
                 <artifactId>maven-antrun-plugin</artifactId>
                 <executions>
                     <execution>
-                        <id>build-eclipse-help</id>
+                        <id>build-eclipse-help-ldifeditor-help</id>
                         <phase>process-classes</phase>
                         <configuration>
                             <tasks>

Modified: directory/sandbox/felixk/studio-ldifeditor/META-INF/MANIFEST.MF
URL: http://svn.apache.org/viewvc/directory/sandbox/felixk/studio-ldifeditor/META-INF/MANIFEST.MF?rev=598090&r1=598089&r2=598090&view=diff
==============================================================================
--- directory/sandbox/felixk/studio-ldifeditor/META-INF/MANIFEST.MF (original)
+++ directory/sandbox/felixk/studio-ldifeditor/META-INF/MANIFEST.MF Sun Nov 25 15:22:14 2007
@@ -16,6 +16,7 @@
  org.eclipse.ui.forms,
  org.eclipse.jface.text,
  org.apache.directory.studio.jars,
+ org.apache.directory.studio.ldifparser,
  org.apache.directory.studio.connection.core,
  org.apache.directory.studio.connection.ui,
  org.apache.directory.studio.ldapbrowser.core,
@@ -29,13 +30,4 @@
  org.apache.directory.studio.ldifeditor.editor.text,
  org.apache.directory.studio.ldifeditor.widgets,
  org.apache.directory.studio.ldifeditor.wizards
-Bundle-ClassPath: .,
- antlr-2.7.7.jar,
- commons-codec-1.3.jar,
- commons-collections-3.2.jar,
- commons-io-1.3.1.jar,
- commons-lang-2.1.jar,
- shared-asn1-0.9.7-SNAPSHOT.jar,
- shared-ldap-0.9.7-SNAPSHOT.jar,
- shared-ldap-constants-0.9.7-SNAPSHOT.jar,
- poi-3.0.1-FINAL.jar
+Bundle-ClassPath: .

Modified: directory/sandbox/felixk/studio-ldifeditor/pom.xml
URL: http://svn.apache.org/viewvc/directory/sandbox/felixk/studio-ldifeditor/pom.xml?rev=598090&r1=598089&r2=598090&view=diff
==============================================================================
--- directory/sandbox/felixk/studio-ldifeditor/pom.xml (original)
+++ directory/sandbox/felixk/studio-ldifeditor/pom.xml Sun Nov 25 15:22:14 2007
@@ -1,213 +1,202 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
 <!--
-    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.
+  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.
 -->
 <!--
-    @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
-    @version $Id: pom.xml 353 2007-10-28 14:59:35Z felix $
+  @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
+  @version $Id: pom.xml 353 2007-10-28 14:59:35Z felix $
 -->
 
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-    <modelVersion>4.0.0</modelVersion>
-    <parent>
-        <groupId>org.apache.directory.studio</groupId>
-        <artifactId>parent</artifactId>
-        <version>1.0.2-SNAPSHOT</version>
-    </parent>
-    <artifactId>${groupId}.ldifeditor</artifactId>
-    <version>${ldifeditor.version}</version>
-    <name>Apache Directory Studio LDIF Editor</name>
-    <packaging>jar</packaging>
+  <modelVersion>4.0.0</modelVersion>
+  <parent>
+    <groupId>org.apache.directory.studio</groupId>
+    <artifactId>parent</artifactId>
+    <version>1.0.2-SNAPSHOT</version>
+  </parent>
+  <artifactId>${groupId}.ldifeditor</artifactId>
+  <version>${ldifeditor.version}</version>
+  <name>Apache Directory Studio LDIF Editor</name>
+  <packaging>jar</packaging>
 
-    <description></description>
+  <description></description>
 
-    <!-- Set path for local repository -->
-    <properties>
-        <local-repo>${project.basedir}/../local-repository</local-repo>
-    </properties>
+  <!-- Set path for local repository -->
+  <properties>
+    <local-repo>${project.basedir}/../local-repository</local-repo>
+  </properties>
 
-    <build>
-        <resources>
-            <resource>
-                <directory>.</directory>
-                <includes>
-                    <include>plugin.xml</include>
-                    <include>about.ini</include>
-                    <include>studio.png</include>
-                </includes>
-            </resource>
-            <resource>
-                <directory>resources</directory>
-                <targetPath>resources</targetPath>
-            </resource>
-            <resource>
-                <directory>src/main/resources</directory>
-            </resource>
-        </resources>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-eclipse-plugin</artifactId>
-                <configuration>
-                    <pde>true</pde>
-                    <buildcommands>
-                        <buildcommand>org.eclipse.jdt.core.javabuilder</buildcommand>
-                        <buildcommand>org.eclipse.pde.ManifestBuilder</buildcommand>
-                        <buildcommand>org.eclipse.pde.SchemaBuilder</buildcommand>
-                    </buildcommands>
-                    <projectnatures>
-                        <projectnature>org.eclipse.pde.PluginNature</projectnature>
-                        <projectnature>org.eclipse.jdt.core.javanature</projectnature>
-                    </projectnatures>
-                </configuration>
-            </plugin>
-            <plugin>
-              <groupId>org.apache.maven.plugins</groupId>
-              <artifactId>maven-dependency-plugin</artifactId>
-              <executions>
-                <execution>
-                  <id>copy-dependencies</id>
-                  <phase>process-sources</phase>
-                  <goals>
-                    <goal>copy-dependencies</goal>
-                  </goals>
-                  <configuration>
-                    <outputDirectory>${basedir}</outputDirectory>
-                    <overWriteReleases>false</overWriteReleases>
-                    <overWriteSnapshots>false</overWriteSnapshots>
-                    <overWriteIfNewer>true</overWriteIfNewer>
-                  </configuration>
-                </execution>
-              </executions>
-            </plugin>
-            <plugin>
-              <artifactId>maven-clean-plugin</artifactId>
-              <configuration>
-                <filesets>
-                  <fileset>
-                    <directory>${basedir}</directory>
-                    <includes>
-                      <include>*.jar</include>
-                    </includes>
-                    <followSymlinks>false</followSymlinks>
-                  </fileset>
-                </filesets>
-              </configuration>
-            </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-jar-plugin</artifactId>
-                <configuration>
-                    <archive>
-                        <manifestFile>META-INF/MANIFEST.MF</manifestFile>
-                        <addMavenDescriptor>false</addMavenDescriptor>
-                    </archive>
-                </configuration>
-            </plugin>
-        </plugins>
-    </build>
+  <build>
+    <resources>
+      <resource>
+        <directory>.</directory>
+        <includes>
+          <include>plugin.xml</include>
+          <include>about.ini</include>
+          <include>studio.png</include>
+        </includes>
+      </resource>
+      <resource>
+        <directory>resources</directory>
+        <targetPath>resources</targetPath>
+      </resource>
+      <resource>
+        <directory>src/main/resources</directory>
+      </resource>
+    </resources>
+    <plugins>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-eclipse-plugin</artifactId>
+        <configuration>
+          <pde>true</pde>
+          <buildcommands>
+            <buildcommand>org.eclipse.jdt.core.javabuilder</buildcommand>
+            <buildcommand>org.eclipse.pde.ManifestBuilder</buildcommand>
+            <buildcommand>org.eclipse.pde.SchemaBuilder</buildcommand>
+          </buildcommands>
+          <projectnatures>
+            <projectnature>org.eclipse.pde.PluginNature</projectnature>
+            <projectnature>org.eclipse.jdt.core.javanature</projectnature>
+          </projectnatures>
+        </configuration>
+      </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-jar-plugin</artifactId>
+        <configuration>
+          <archive>
+            <manifestFile>META-INF/MANIFEST.MF</manifestFile>
+            <addMavenDescriptor>false</addMavenDescriptor>
+          </archive>
+        </configuration>
+      </plugin>
+    </plugins>
+  </build>
 
-    <dependencies>
-        <dependency>
-            <groupId>org.apache.directory.shared</groupId>
-            <artifactId>shared-ldap</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.directory.studio</groupId>
-            <artifactId>${pom.groupId}.connection.ui</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.directory.studio</groupId>
-            <artifactId>${pom.groupId}.connection.core</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.directory.studio</groupId>
-            <artifactId>${pom.groupId}.ldapbrowser.common</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.directory.studio</groupId>
-            <artifactId>${pom.groupId}.ldapbrowser.core</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.directory.studio</groupId>
-            <artifactId>${pom.groupId}.valueeditors</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.eclipse</groupId>
-            <artifactId>${swt.platformrelated.artifactId}</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.eclipse</groupId>
-            <artifactId>org.eclipse.core.commands</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.eclipse</groupId>
-            <artifactId>org.eclipse.core.jobs</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.eclipse</groupId>
-            <artifactId>org.eclipse.equinox.preferences</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.eclipse</groupId>
-            <artifactId>org.eclipse.equinox.common</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.eclipse</groupId>
-            <artifactId>org.eclipse.osgi</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.eclipse</groupId>
-            <artifactId>org.eclipse.core.runtime</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.eclipse</groupId>
-            <artifactId>org.eclipse.equinox.registry</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.eclipse</groupId>
-            <artifactId>org.eclipse.jface</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.eclipse</groupId>
-            <artifactId>org.eclipse.jface.text</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.eclipse</groupId>
-            <artifactId>org.eclipse.core.filebuffers</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.eclipse</groupId>
-            <artifactId>org.eclipse.ui.editors</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.eclipse</groupId>
-            <artifactId>org.eclipse.ui.views</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.eclipse</groupId>
-            <artifactId>org.eclipse.ui.workbench</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.eclipse</groupId>
-            <artifactId>org.eclipse.ui.workbench.texteditor</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.eclipse</groupId>
-            <artifactId>org.eclipse.text</artifactId>
-        </dependency>
-    </dependencies>
+  <dependencies>
+    <dependency>
+      <groupId>org.apache.directory.shared</groupId>
+      <artifactId>shared-ldap</artifactId>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.directory.studio</groupId>
+      <artifactId>${pom.groupId}.connection.ui</artifactId>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.directory.studio</groupId>
+      <artifactId>${pom.groupId}.connection.core</artifactId>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.directory.studio</groupId>
+      <artifactId>${pom.groupId}.ldapbrowser.common</artifactId>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.directory.studio</groupId>
+      <artifactId>${pom.groupId}.ldapbrowser.core</artifactId>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.directory.studio</groupId>
+      <artifactId>${pom.groupId}.valueeditors</artifactId>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.eclipse</groupId>
+      <artifactId>${swt.platformrelated.artifactId}</artifactId>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.eclipse</groupId>
+      <artifactId>org.eclipse.core.commands</artifactId>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.eclipse</groupId>
+      <artifactId>org.eclipse.core.jobs</artifactId>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.eclipse</groupId>
+      <artifactId>org.eclipse.equinox.preferences</artifactId>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.eclipse</groupId>
+      <artifactId>org.eclipse.equinox.common</artifactId>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.eclipse</groupId>
+      <artifactId>org.eclipse.osgi</artifactId>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.eclipse</groupId>
+      <artifactId>org.eclipse.core.runtime</artifactId>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.eclipse</groupId>
+      <artifactId>org.eclipse.equinox.registry</artifactId>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.eclipse</groupId>
+      <artifactId>org.eclipse.jface</artifactId>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.eclipse</groupId>
+      <artifactId>org.eclipse.jface.text</artifactId>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.eclipse</groupId>
+      <artifactId>org.eclipse.core.filebuffers</artifactId>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.eclipse</groupId>
+      <artifactId>org.eclipse.ui.editors</artifactId>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.eclipse</groupId>
+      <artifactId>org.eclipse.ui.views</artifactId>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.eclipse</groupId>
+      <artifactId>org.eclipse.ui.workbench</artifactId>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.eclipse</groupId>
+      <artifactId>org.eclipse.ui.workbench.texteditor</artifactId>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.eclipse</groupId>
+      <artifactId>org.eclipse.text</artifactId>
+      <scope>provided</scope>
+    </dependency>
+  </dependencies>
 </project>

Modified: directory/sandbox/felixk/studio-rcp-help/pom.xml
URL: http://svn.apache.org/viewvc/directory/sandbox/felixk/studio-rcp-help/pom.xml?rev=598090&r1=598089&r2=598090&view=diff
==============================================================================
--- directory/sandbox/felixk/studio-rcp-help/pom.xml (original)
+++ directory/sandbox/felixk/studio-rcp-help/pom.xml Sun Nov 25 15:22:14 2007
@@ -219,7 +219,7 @@
                 <artifactId>maven-dependency-plugin</artifactId>
                 <executions>
                     <execution>
-                        <id>unpack</id>
+                        <id>unpack-rcp-help</id>
                         <phase>process-resources</phase>
                         <goals>
                             <goal>unpack</goal>
@@ -249,7 +249,7 @@
                 <artifactId>maven-antrun-plugin</artifactId>
                 <executions>
                     <execution>
-                        <id>build-eclipse-help</id>
+                        <id>build-eclipse-help-rcp-help</id>
                         <phase>process-classes</phase>
                         <configuration>
                             <tasks>

Modified: directory/sandbox/felixk/studio-rcp/pom.xml
URL: http://svn.apache.org/viewvc/directory/sandbox/felixk/studio-rcp/pom.xml?rev=598090&r1=598089&r2=598090&view=diff
==============================================================================
--- directory/sandbox/felixk/studio-rcp/pom.xml (original)
+++ directory/sandbox/felixk/studio-rcp/pom.xml Sun Nov 25 15:22:14 2007
@@ -88,7 +88,7 @@
         <artifactId>maven-dependency-plugin</artifactId>
         <executions>
           <execution>
-            <id>copy</id>
+            <id>copy-rcp</id>
             <phase>compile</phase>
             <goals>
               <goal>copy-dependencies</goal>
@@ -97,19 +97,6 @@
               <overWrite>true</overWrite>
               <outputDirectory>target/classes</outputDirectory>
               <excludeScope>provided</excludeScope>
-            </configuration>
-          </execution>
-          <execution>
-            <id>copy-dependencies</id>
-            <phase>process-sources</phase>
-            <goals>
-              <goal>copy-dependencies</goal>
-            </goals>
-            <configuration>
-              <outputDirectory>${basedir}</outputDirectory>
-              <overWriteReleases>false</overWriteReleases>
-              <overWriteSnapshots>false</overWriteSnapshots>
-              <overWriteIfNewer>true</overWriteIfNewer>
             </configuration>
           </execution>
         </executions>

Modified: directory/sandbox/felixk/studio-schemaeditor-help/pom.xml
URL: http://svn.apache.org/viewvc/directory/sandbox/felixk/studio-schemaeditor-help/pom.xml?rev=598090&r1=598089&r2=598090&view=diff
==============================================================================
--- directory/sandbox/felixk/studio-schemaeditor-help/pom.xml (original)
+++ directory/sandbox/felixk/studio-schemaeditor-help/pom.xml Sun Nov 25 15:22:14 2007
@@ -210,7 +210,7 @@
                 <artifactId>maven-dependency-plugin</artifactId>
                 <executions>
                     <execution>
-                        <id>unpack</id>
+                        <id>unpack-schemaeditor-help</id>
                         <phase>process-resources</phase>
                         <goals>
                             <goal>unpack</goal>
@@ -240,7 +240,7 @@
                 <artifactId>maven-antrun-plugin</artifactId>
                 <executions>
                     <execution>
-                        <id>build-eclipse-help</id>
+                        <id>build-eclipse-help-schemaeditor-help</id>
                         <phase>process-classes</phase>
                         <configuration>
                             <tasks>

Modified: directory/sandbox/felixk/studio-schemaeditor/pom.xml
URL: http://svn.apache.org/viewvc/directory/sandbox/felixk/studio-schemaeditor/pom.xml?rev=598090&r1=598089&r2=598090&view=diff
==============================================================================
--- directory/sandbox/felixk/studio-schemaeditor/pom.xml (original)
+++ directory/sandbox/felixk/studio-schemaeditor/pom.xml Sun Nov 25 15:22:14 2007
@@ -75,7 +75,7 @@
         <artifactId>maven-dependency-plugin</artifactId>
         <executions>
           <execution>
-            <id>copy</id>
+            <id>copy-schemaeditor</id>
             <phase>compile</phase>
             <goals>
               <goal>copy-dependencies</goal>
@@ -84,19 +84,6 @@
               <overWrite>true</overWrite>
               <outputDirectory>target/classes</outputDirectory>
               <excludeScope>provided</excludeScope>
-            </configuration>
-          </execution>
-          <execution>
-            <id>copy-dependencies</id>
-            <phase>process-sources</phase>
-            <goals>
-              <goal>copy-dependencies</goal>
-            </goals>
-            <configuration>
-              <outputDirectory>${basedir}</outputDirectory>
-              <overWriteReleases>false</overWriteReleases>
-              <overWriteSnapshots>false</overWriteSnapshots>
-              <overWriteIfNewer>true</overWriteIfNewer>
             </configuration>
           </execution>
         </executions>

Modified: directory/sandbox/felixk/studio-valueeditors/META-INF/MANIFEST.MF
URL: http://svn.apache.org/viewvc/directory/sandbox/felixk/studio-valueeditors/META-INF/MANIFEST.MF?rev=598090&r1=598089&r2=598090&view=diff
==============================================================================
--- directory/sandbox/felixk/studio-valueeditors/META-INF/MANIFEST.MF (original)
+++ directory/sandbox/felixk/studio-valueeditors/META-INF/MANIFEST.MF Sun Nov 25 15:22:14 2007
@@ -5,6 +5,7 @@
 Bundle-Version: 1.0.0
 Bundle-Activator: org.apache.directory.studio.valueeditors.ValueEditorsActivator
 Bundle-Vendor: The Apache Software Foundation
+Bundle-Localization: plugin
 Require-Bundle: org.eclipse.ui,
  org.eclipse.core.runtime,
  org.apache.directory.studio.jars,
@@ -12,7 +13,6 @@
  org.apache.directory.studio.connection.ui,
  org.apache.directory.studio.ldapbrowser.core,
  org.apache.directory.studio.ldapbrowser.common
-Bundle-Localization: plugin
 Eclipse-LazyStart: true
 Export-Package: org.apache.directory.studio.valueeditors,
  org.apache.directory.studio.valueeditors.address,
@@ -22,13 +22,4 @@
  org.apache.directory.studio.valueeditors.objectclass,
  org.apache.directory.studio.valueeditors.password,
  org.apache.directory.studio.valueeditors.time
-Bundle-ClassPath: .,
- antlr-2.7.7.jar,
- commons-codec-1.3.jar,
- commons-collections-3.2.jar,
- commons-io-1.3.1.jar,
- commons-lang-2.1.jar,
- shared-asn1-0.9.7-SNAPSHOT.jar,
- shared-ldap-0.9.7-SNAPSHOT.jar,
- shared-ldap-constants-0.9.7-SNAPSHOT.jar,
- poi-3.0.1-FINAL.jar
+Bundle-ClassPath: .

Modified: directory/sandbox/felixk/studio-valueeditors/pom.xml
URL: http://svn.apache.org/viewvc/directory/sandbox/felixk/studio-valueeditors/pom.xml?rev=598090&r1=598089&r2=598090&view=diff
==============================================================================
--- directory/sandbox/felixk/studio-valueeditors/pom.xml (original)
+++ directory/sandbox/felixk/studio-valueeditors/pom.xml Sun Nov 25 15:22:14 2007
@@ -74,39 +74,6 @@
       </plugin>
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-dependency-plugin</artifactId>
-        <executions>
-          <execution>
-            <id>copy-dependencies</id>
-            <phase>process-sources</phase>
-            <goals>
-              <goal>copy-dependencies</goal>
-            </goals>
-            <configuration>
-              <outputDirectory>${basedir}</outputDirectory>
-              <overWriteReleases>false</overWriteReleases>
-              <overWriteSnapshots>false</overWriteSnapshots>
-              <overWriteIfNewer>true</overWriteIfNewer>
-            </configuration>
-          </execution>
-        </executions>
-      </plugin>
-      <plugin>
-        <artifactId>maven-clean-plugin</artifactId>
-        <configuration>
-          <filesets>
-            <fileset>
-              <directory>${basedir}</directory>
-              <includes>
-                <include>*.jar</include>
-              </includes>
-              <followSymlinks>false</followSymlinks>
-            </fileset>
-          </filesets>
-        </configuration>
-      </plugin>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-jar-plugin</artifactId>
         <configuration>
           <archive>
@@ -122,50 +89,62 @@
     <dependency>
       <groupId>org.eclipse</groupId>
       <artifactId>${swt.platformrelated.artifactId}</artifactId>
+      <scope>provided</scope>
     </dependency>
     <dependency>
       <groupId>org.eclipse</groupId>
       <artifactId>org.eclipse.osgi</artifactId>
+      <scope>provided</scope>
     </dependency>
     <dependency>
       <groupId>org.apache.directory.shared</groupId>
       <artifactId>shared-ldap</artifactId>
+      <scope>provided</scope>
     </dependency>
     <dependency>
       <groupId>org.apache.directory.studio</groupId>
       <artifactId>${pom.groupId}.ldapbrowser.common</artifactId>
+      <scope>provided</scope>
     </dependency>
     <dependency>
       <groupId>org.apache.directory.studio</groupId>
       <artifactId>${pom.groupId}.connection.ui</artifactId>
+      <scope>provided</scope>
     </dependency>
     <dependency>
       <groupId>org.apache.directory.studio</groupId>
       <artifactId>${pom.groupId}.connection.core</artifactId>
+      <scope>provided</scope>
     </dependency>
     <dependency>
       <groupId>org.apache.directory.studio</groupId>
       <artifactId>${pom.groupId}.ldapbrowser.core</artifactId>
+      <scope>provided</scope>
     </dependency>
     <dependency>
       <groupId>org.eclipse</groupId>
       <artifactId>org.eclipse.core.runtime</artifactId>
+      <scope>provided</scope>
     </dependency>
     <dependency>
       <groupId>org.eclipse</groupId>
       <artifactId>org.eclipse.jface</artifactId>
+      <scope>provided</scope>
     </dependency>
     <dependency>
       <groupId>org.eclipse</groupId>
       <artifactId>org.eclipse.core.jobs</artifactId>
+      <scope>provided</scope>
     </dependency>
     <dependency>
       <groupId>org.eclipse</groupId>
       <artifactId>org.eclipse.equinox.common</artifactId>
+      <scope>provided</scope>
     </dependency>
     <dependency>
       <groupId>org.eclipse</groupId>
       <artifactId>org.eclipse.ui.workbench</artifactId>
+      <scope>provided</scope>
     </dependency>
   </dependencies>
 </project>

Modified: directory/sandbox/felixk/studio/pom.xml
URL: http://svn.apache.org/viewvc/directory/sandbox/felixk/studio/pom.xml?rev=598090&r1=598089&r2=598090&view=diff
==============================================================================
--- directory/sandbox/felixk/studio/pom.xml (original)
+++ directory/sandbox/felixk/studio/pom.xml Sun Nov 25 15:22:14 2007
@@ -769,7 +769,7 @@
                 <artifactId>maven-dependency-plugin</artifactId>
                 <executions>
                     <execution>
-                        <id>unpack-eclipse-plugins</id>
+                        <id>unpack-eclipse-plugins1111</id>
                         <phase>process-resources</phase>
                         <goals>
                             <goal>unpack</goal>
@@ -809,7 +809,7 @@
                 <artifactId>maven-studio-plugin</artifactId>
                 <executions>
                     <execution>
-                        <id>copy-directory-studio-plugins</id>
+                        <id>copy-directory-studio-plugins2222</id>
                         <phase>process-resources</phase>
                         <goals>
                             <goal>copy-eclipse-artifact</goal>



Mime
View raw message