directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From pamarce...@apache.org
Subject svn commit: r984799 [1/2] - in /directory/studio/trunk: ldifparser/ org.antlr.antlr/ org.apache.commons.codec/ org.apache.commons.collections/ org.apache.commons.io/ org.apache.commons.lang/ org.apache.commons.logging/ org.apache.directory.shared.asn1/...
Date Thu, 12 Aug 2010 14:22:29 GMT
Author: pamarcelot
Date: Thu Aug 12 14:22:27 2010
New Revision: 984799

URL: http://svn.apache.org/viewvc?rev=984799&view=rev
Log:
Updated pom.xml files of projects which repackages external libraries to have them put the jar in a 'lib' folder and link it in their Manifest.

Removed:
    directory/studio/trunk/org.antlr.antlr/.classpath
    directory/studio/trunk/org.antlr.antlr/.project
    directory/studio/trunk/org.apache.commons.codec/.classpath
    directory/studio/trunk/org.apache.commons.codec/.project
    directory/studio/trunk/org.apache.commons.collections/.classpath
    directory/studio/trunk/org.apache.commons.collections/.project
    directory/studio/trunk/org.apache.commons.io/.classpath
    directory/studio/trunk/org.apache.commons.io/.project
    directory/studio/trunk/org.apache.commons.lang/.classpath
    directory/studio/trunk/org.apache.commons.lang/.project
    directory/studio/trunk/org.apache.commons.logging/.classpath
    directory/studio/trunk/org.apache.commons.logging/.project
    directory/studio/trunk/org.apache.directory.shared.asn1/.classpath
    directory/studio/trunk/org.apache.directory.shared.asn1/.project
    directory/studio/trunk/org.apache.directory.shared.dsmlparser/.classpath
    directory/studio/trunk/org.apache.directory.shared.dsmlparser/.project
    directory/studio/trunk/org.apache.directory.shared.ldap/.classpath
    directory/studio/trunk/org.apache.directory.shared.ldap/.project
    directory/studio/trunk/org.apache.directory.shared.ldapconstants/.classpath
    directory/studio/trunk/org.apache.directory.shared.ldapconstants/.project
    directory/studio/trunk/org.apache.httpcomponents.httpclient/.classpath
    directory/studio/trunk/org.apache.httpcomponents.httpclient/.project
    directory/studio/trunk/org.apache.httpcomponents.httpcore/.classpath
    directory/studio/trunk/org.apache.httpcomponents.httpcore/.project
    directory/studio/trunk/org.apache.logging.log4j/.project
    directory/studio/trunk/org.apache.mina.core/.classpath
    directory/studio/trunk/org.apache.mina.core/.project
    directory/studio/trunk/org.bouncycastle.bcprovjdk15/.classpath
    directory/studio/trunk/org.bouncycastle.bcprovjdk15/.project
    directory/studio/trunk/org.dom4j.dom4j/.classpath
    directory/studio/trunk/org.dom4j.dom4j/.project
    directory/studio/trunk/org.slf4j.api/.classpath
    directory/studio/trunk/org.slf4j.api/.project
    directory/studio/trunk/org.slf4j.log4j12/.classpath
    directory/studio/trunk/org.slf4j.log4j12/.project
    directory/studio/trunk/org.xpp3.xpp3/.classpath
    directory/studio/trunk/org.xpp3.xpp3/.project
Modified:
    directory/studio/trunk/ldifparser/pom.xml
    directory/studio/trunk/org.antlr.antlr/   (props changed)
    directory/studio/trunk/org.antlr.antlr/pom.xml
    directory/studio/trunk/org.apache.commons.codec/   (props changed)
    directory/studio/trunk/org.apache.commons.codec/pom.xml
    directory/studio/trunk/org.apache.commons.collections/   (props changed)
    directory/studio/trunk/org.apache.commons.collections/pom.xml
    directory/studio/trunk/org.apache.commons.io/   (props changed)
    directory/studio/trunk/org.apache.commons.io/pom.xml
    directory/studio/trunk/org.apache.commons.lang/   (props changed)
    directory/studio/trunk/org.apache.commons.lang/pom.xml
    directory/studio/trunk/org.apache.commons.logging/   (props changed)
    directory/studio/trunk/org.apache.commons.logging/pom.xml
    directory/studio/trunk/org.apache.directory.shared.asn1/   (props changed)
    directory/studio/trunk/org.apache.directory.shared.asn1/pom.xml
    directory/studio/trunk/org.apache.directory.shared.dsmlparser/   (props changed)
    directory/studio/trunk/org.apache.directory.shared.dsmlparser/pom.xml
    directory/studio/trunk/org.apache.directory.shared.ldap/   (props changed)
    directory/studio/trunk/org.apache.directory.shared.ldap/pom.xml
    directory/studio/trunk/org.apache.directory.shared.ldapconstants/   (props changed)
    directory/studio/trunk/org.apache.directory.shared.ldapconstants/pom.xml
    directory/studio/trunk/org.apache.httpcomponents.httpclient/   (props changed)
    directory/studio/trunk/org.apache.httpcomponents.httpclient/pom.xml
    directory/studio/trunk/org.apache.httpcomponents.httpcore/   (props changed)
    directory/studio/trunk/org.apache.httpcomponents.httpcore/pom.xml
    directory/studio/trunk/org.apache.logging.log4j/   (props changed)
    directory/studio/trunk/org.apache.logging.log4j/.classpath
    directory/studio/trunk/org.apache.logging.log4j/pom.xml
    directory/studio/trunk/org.apache.mina.core/   (props changed)
    directory/studio/trunk/org.apache.mina.core/pom.xml
    directory/studio/trunk/org.bouncycastle.bcprovjdk15/   (props changed)
    directory/studio/trunk/org.bouncycastle.bcprovjdk15/pom.xml
    directory/studio/trunk/org.dom4j.dom4j/   (props changed)
    directory/studio/trunk/org.dom4j.dom4j/pom.xml
    directory/studio/trunk/org.slf4j.api/   (props changed)
    directory/studio/trunk/org.slf4j.api/pom.xml
    directory/studio/trunk/org.slf4j.log4j12/   (props changed)
    directory/studio/trunk/org.slf4j.log4j12/pom.xml
    directory/studio/trunk/org.xpp3.xpp3/   (props changed)
    directory/studio/trunk/org.xpp3.xpp3/pom.xml
    directory/studio/trunk/schemaeditor/pom.xml

Modified: directory/studio/trunk/ldifparser/pom.xml
URL: http://svn.apache.org/viewvc/directory/studio/trunk/ldifparser/pom.xml?rev=984799&r1=984798&r2=984799&view=diff
==============================================================================
--- directory/studio/trunk/ldifparser/pom.xml (original)
+++ directory/studio/trunk/ldifparser/pom.xml Thu Aug 12 14:22:27 2010
@@ -126,18 +126,18 @@
   <dependencies>
     <!-- Apache Directory Studio library plugins dependencies -->
     <dependency>
-      <groupId>org.apache.directory.studio</groupId>
-      <artifactId>org.apache.commons.codec</artifactId>
+      <groupId>commons-codec</groupId>
+      <artifactId>commons-codec</artifactId>
       <scope>provided</scope>
     </dependency>
     <dependency>
-      <groupId>org.apache.directory.studio</groupId>
-      <artifactId>org.apache.directory.shared.ldap</artifactId>
+      <groupId>org.apache.directory.shared</groupId>
+      <artifactId>shared-ldap</artifactId>
       <scope>provided</scope>
     </dependency>
     <dependency>
-      <groupId>org.apache.directory.studio</groupId>
-      <artifactId>org.slf4j.log4j12</artifactId>
+      <groupId>org.slf4j</groupId>
+      <artifactId>slf4j-log4j12</artifactId>
       <scope>provided</scope>
     </dependency>
     

Propchange: directory/studio/trunk/org.antlr.antlr/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Thu Aug 12 14:22:27 2010
@@ -1,3 +1,6 @@
+.classpath
+.project
+.settings
+lib
 META-INF
-src
 target

Modified: directory/studio/trunk/org.antlr.antlr/pom.xml
URL: http://svn.apache.org/viewvc/directory/studio/trunk/org.antlr.antlr/pom.xml?rev=984799&r1=984798&r2=984799&view=diff
==============================================================================
--- directory/studio/trunk/org.antlr.antlr/pom.xml (original)
+++ directory/studio/trunk/org.antlr.antlr/pom.xml Thu Aug 12 14:22:27 2010
@@ -40,15 +40,32 @@
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-eclipse-plugin</artifactId>
         <configuration>
-          <skip>true</skip>
+          <skip>false</skip>
+          <pde>true</pde>
+          <additionalProjectnatures>
+            <projectnature>org.eclipse.pde.PluginNature</projectnature>
+            <projectnature>org.eclipse.jdt.core.javanature</projectnature>
+          </additionalProjectnatures>
+          <classpathContainers>
+            <classpathContainer>org.eclipse.jdt.launching.JRE_CONTAINER</classpathContainer>
+            <classpathContainer>org.eclipse.pde.core.requiredPlugins</classpathContainer>
+          </classpathContainers>
         </configuration>
       </plugin>
       <plugin>
         <groupId>org.apache.directory.studio</groupId>
         <artifactId>studio-maven-plugin</artifactId>
         <configuration>
-          <skip>true</skip>
+          <skip>false</skip>
+          <createManifest>true</createManifest>
         </configuration>
+        <executions>
+          <execution>
+            <goals>
+              <goal>prepare-jar-package</goal>
+            </goals>
+          </execution>
+        </executions>
       </plugin>
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
@@ -67,11 +84,13 @@
         <extensions>true</extensions>
         <configuration>
           <manifestLocation>META-INF</manifestLocation>
-          <instructions>            
+          <instructions>
             <Bundle-SymbolicName>${artifactId}</Bundle-SymbolicName>
+            <Embed-Dependency>*;scope=compile|runtime</Embed-Dependency>
+            <Embed-Directory>lib</Embed-Directory>
+            <Embed-StripGroup>true</Embed-StripGroup>
             <Export-Package>*</Export-Package>
             <Import-Package>!</Import-Package>
-            <Private-Package>!</Private-Package>
           </instructions>
         </configuration>
         <executions>
@@ -84,31 +103,6 @@
           </execution>
         </executions>
       </plugin>
-      
-      <!-- Unpack the jar -->
-      <plugin>
-        <artifactId>maven-dependency-plugin</artifactId>
-        <executions>
-          <execution>
-            <id>unpack-apache-directory-studio-plugin</id>
-            <phase>generate-resources</phase>
-            <goals>
-              <goal>unpack</goal>
-            </goals>
-            <configuration>
-              <overWrite>true</overWrite>
-              <outputDirectory>src/main/resources</outputDirectory>
-              <artifactItems>
-                <artifactItem>
-                  <groupId>antlr</groupId>
-                  <artifactId>antlr</artifactId>
-                  <excludes>META-INF/**</excludes>
-                </artifactItem>
-              </artifactItems>
-            </configuration>
-          </execution>
-        </executions>
-      </plugin>
       <!-- No tests to run -->
       <plugin>
         <artifactId>maven-surefire-plugin</artifactId>
@@ -119,4 +113,11 @@
     </plugins>
   </build>
   
+  <dependencies>
+  	<dependency>
+      <groupId>antlr</groupId>
+      <artifactId>antlr</artifactId>
+    </dependency>
+  </dependencies>
+  
 </project>

Propchange: directory/studio/trunk/org.apache.commons.codec/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Thu Aug 12 14:22:27 2010
@@ -1,3 +1,6 @@
+.classpath
+.project
+.settings
+lib
 META-INF
-src
 target

Modified: directory/studio/trunk/org.apache.commons.codec/pom.xml
URL: http://svn.apache.org/viewvc/directory/studio/trunk/org.apache.commons.codec/pom.xml?rev=984799&r1=984798&r2=984799&view=diff
==============================================================================
--- directory/studio/trunk/org.apache.commons.codec/pom.xml (original)
+++ directory/studio/trunk/org.apache.commons.codec/pom.xml Thu Aug 12 14:22:27 2010
@@ -40,15 +40,32 @@
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-eclipse-plugin</artifactId>
         <configuration>
-          <skip>true</skip>
+          <skip>false</skip>
+          <pde>true</pde>
+          <additionalProjectnatures>
+            <projectnature>org.eclipse.pde.PluginNature</projectnature>
+            <projectnature>org.eclipse.jdt.core.javanature</projectnature>
+          </additionalProjectnatures>
+          <classpathContainers>
+            <classpathContainer>org.eclipse.jdt.launching.JRE_CONTAINER</classpathContainer>
+            <classpathContainer>org.eclipse.pde.core.requiredPlugins</classpathContainer>
+          </classpathContainers>
         </configuration>
       </plugin>
       <plugin>
         <groupId>org.apache.directory.studio</groupId>
         <artifactId>studio-maven-plugin</artifactId>
         <configuration>
-          <skip>true</skip>
+          <skip>false</skip>
+          <createManifest>true</createManifest>
         </configuration>
+        <executions>
+          <execution>
+            <goals>
+              <goal>prepare-jar-package</goal>
+            </goals>
+          </execution>
+        </executions>
       </plugin>
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
@@ -67,11 +84,13 @@
         <extensions>true</extensions>
         <configuration>
           <manifestLocation>META-INF</manifestLocation>
-          <instructions>            
+          <instructions>
             <Bundle-SymbolicName>${artifactId}</Bundle-SymbolicName>
+            <Embed-Dependency>*;scope=compile|runtime</Embed-Dependency>
+            <Embed-Directory>lib</Embed-Directory>
+            <Embed-StripGroup>true</Embed-StripGroup>
             <Export-Package>*</Export-Package>
             <Import-Package>!</Import-Package>
-            <Private-Package>!</Private-Package>
           </instructions>
         </configuration>
         <executions>
@@ -84,31 +103,6 @@
           </execution>
         </executions>
       </plugin>
-      
-      <!-- Unpack the jar -->
-      <plugin>
-        <artifactId>maven-dependency-plugin</artifactId>
-        <executions>
-          <execution>
-            <id>unpack-apache-directory-studio-plugin</id>
-            <phase>generate-resources</phase>
-            <goals>
-              <goal>unpack</goal>
-            </goals>
-            <configuration>
-              <overWrite>true</overWrite>
-              <outputDirectory>src/main/resources</outputDirectory>
-              <artifactItems>
-                <artifactItem>
-                  <groupId>commons-codec</groupId>
-                  <artifactId>commons-codec</artifactId>
-                  <excludes>META-INF/**</excludes>
-                </artifactItem>
-              </artifactItems>
-            </configuration>
-          </execution>
-        </executions>
-      </plugin>
       <!-- No tests to run -->
       <plugin>
         <artifactId>maven-surefire-plugin</artifactId>
@@ -119,4 +113,11 @@
     </plugins>
   </build>
   
+  <dependencies>
+    <dependency>
+      <groupId>commons-codec</groupId>
+      <artifactId>commons-codec</artifactId>
+    </dependency>
+  </dependencies>
+  
 </project>

Propchange: directory/studio/trunk/org.apache.commons.collections/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Thu Aug 12 14:22:27 2010
@@ -1,3 +1,6 @@
+.classpath
+.project
+.settings
+lib
 META-INF
-src
 target

Modified: directory/studio/trunk/org.apache.commons.collections/pom.xml
URL: http://svn.apache.org/viewvc/directory/studio/trunk/org.apache.commons.collections/pom.xml?rev=984799&r1=984798&r2=984799&view=diff
==============================================================================
--- directory/studio/trunk/org.apache.commons.collections/pom.xml (original)
+++ directory/studio/trunk/org.apache.commons.collections/pom.xml Thu Aug 12 14:22:27 2010
@@ -40,15 +40,32 @@
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-eclipse-plugin</artifactId>
         <configuration>
-          <skip>true</skip>
+          <skip>false</skip>
+          <pde>true</pde>
+          <additionalProjectnatures>
+            <projectnature>org.eclipse.pde.PluginNature</projectnature>
+            <projectnature>org.eclipse.jdt.core.javanature</projectnature>
+          </additionalProjectnatures>
+          <classpathContainers>
+            <classpathContainer>org.eclipse.jdt.launching.JRE_CONTAINER</classpathContainer>
+            <classpathContainer>org.eclipse.pde.core.requiredPlugins</classpathContainer>
+          </classpathContainers>
         </configuration>
       </plugin>
       <plugin>
         <groupId>org.apache.directory.studio</groupId>
         <artifactId>studio-maven-plugin</artifactId>
         <configuration>
-          <skip>true</skip>
+          <skip>false</skip>
+          <createManifest>true</createManifest>
         </configuration>
+        <executions>
+          <execution>
+            <goals>
+              <goal>prepare-jar-package</goal>
+            </goals>
+          </execution>
+        </executions>
       </plugin>
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
@@ -67,11 +84,13 @@
         <extensions>true</extensions>
         <configuration>
           <manifestLocation>META-INF</manifestLocation>
-          <instructions>            
+          <instructions>
             <Bundle-SymbolicName>${artifactId}</Bundle-SymbolicName>
+            <Embed-Dependency>*;scope=compile|runtime</Embed-Dependency>
+            <Embed-Directory>lib</Embed-Directory>
+            <Embed-StripGroup>true</Embed-StripGroup>
             <Export-Package>*</Export-Package>
             <Import-Package>!</Import-Package>
-            <Private-Package>!</Private-Package>
           </instructions>
         </configuration>
         <executions>
@@ -84,31 +103,6 @@
           </execution>
         </executions>
       </plugin>
-      
-      <!-- Unpack the jar -->
-      <plugin>
-        <artifactId>maven-dependency-plugin</artifactId>
-        <executions>
-          <execution>
-            <id>unpack-apache-directory-studio-plugin</id>
-            <phase>generate-resources</phase>
-            <goals>
-              <goal>unpack</goal>
-            </goals>
-            <configuration>
-              <overWrite>true</overWrite>
-              <outputDirectory>src/main/resources</outputDirectory>
-              <artifactItems>
-                <artifactItem>
-                  <groupId>commons-collections</groupId>
-                  <artifactId>commons-collections</artifactId>
-                  <excludes>META-INF/**</excludes>
-                </artifactItem>
-              </artifactItems>
-            </configuration>
-          </execution>
-        </executions>
-      </plugin>
       <!-- No tests to run -->
       <plugin>
         <artifactId>maven-surefire-plugin</artifactId>
@@ -119,4 +113,11 @@
     </plugins>
   </build>
   
+  <dependencies>
+    <dependency>
+      <groupId>commons-collections</groupId>
+      <artifactId>commons-collections</artifactId>
+    </dependency>
+  </dependencies>
+  
 </project>

Propchange: directory/studio/trunk/org.apache.commons.io/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Thu Aug 12 14:22:27 2010
@@ -1,3 +1,6 @@
+.classpath
+.project
+.settings
+lib
 META-INF
-src
 target

Modified: directory/studio/trunk/org.apache.commons.io/pom.xml
URL: http://svn.apache.org/viewvc/directory/studio/trunk/org.apache.commons.io/pom.xml?rev=984799&r1=984798&r2=984799&view=diff
==============================================================================
--- directory/studio/trunk/org.apache.commons.io/pom.xml (original)
+++ directory/studio/trunk/org.apache.commons.io/pom.xml Thu Aug 12 14:22:27 2010
@@ -40,15 +40,32 @@
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-eclipse-plugin</artifactId>
         <configuration>
-          <skip>true</skip>
+          <skip>false</skip>
+          <pde>true</pde>
+          <additionalProjectnatures>
+            <projectnature>org.eclipse.pde.PluginNature</projectnature>
+            <projectnature>org.eclipse.jdt.core.javanature</projectnature>
+          </additionalProjectnatures>
+          <classpathContainers>
+            <classpathContainer>org.eclipse.jdt.launching.JRE_CONTAINER</classpathContainer>
+            <classpathContainer>org.eclipse.pde.core.requiredPlugins</classpathContainer>
+          </classpathContainers>
         </configuration>
       </plugin>
       <plugin>
         <groupId>org.apache.directory.studio</groupId>
         <artifactId>studio-maven-plugin</artifactId>
         <configuration>
-          <skip>true</skip>
+          <skip>false</skip>
+          <createManifest>true</createManifest>
         </configuration>
+        <executions>
+          <execution>
+            <goals>
+              <goal>prepare-jar-package</goal>
+            </goals>
+          </execution>
+        </executions>
       </plugin>
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
@@ -67,11 +84,13 @@
         <extensions>true</extensions>
         <configuration>
           <manifestLocation>META-INF</manifestLocation>
-          <instructions>            
+          <instructions>
             <Bundle-SymbolicName>${artifactId}</Bundle-SymbolicName>
+            <Embed-Dependency>*;scope=compile|runtime</Embed-Dependency>
+            <Embed-Directory>lib</Embed-Directory>
+            <Embed-StripGroup>true</Embed-StripGroup>
             <Export-Package>*</Export-Package>
             <Import-Package>!</Import-Package>
-            <Private-Package>!</Private-Package>
           </instructions>
         </configuration>
         <executions>
@@ -84,31 +103,6 @@
           </execution>
         </executions>
       </plugin>
-      
-      <!-- Unpack the jar -->
-      <plugin>
-        <artifactId>maven-dependency-plugin</artifactId>
-        <executions>
-          <execution>
-            <id>unpack-apache-directory-studio-plugin</id>
-            <phase>generate-resources</phase>
-            <goals>
-              <goal>unpack</goal>
-            </goals>
-            <configuration>
-              <overWrite>true</overWrite>
-              <outputDirectory>src/main/resources</outputDirectory>
-              <artifactItems>
-                <artifactItem>
-                  <groupId>commons-io</groupId>
-                  <artifactId>commons-io</artifactId>
-                  <excludes>META-INF/**</excludes>
-                </artifactItem>
-              </artifactItems>
-            </configuration>
-          </execution>
-        </executions>
-      </plugin>
       <!-- No tests to run -->
       <plugin>
         <artifactId>maven-surefire-plugin</artifactId>
@@ -119,4 +113,11 @@
     </plugins>
   </build>
   
+  <dependencies>
+    <dependency>
+      <groupId>commons-io</groupId>
+      <artifactId>commons-io</artifactId>
+    </dependency>
+  </dependencies>
+  
 </project>

Propchange: directory/studio/trunk/org.apache.commons.lang/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Thu Aug 12 14:22:27 2010
@@ -1,3 +1,6 @@
+.classpath
+.project
+.settings
+lib
 META-INF
-src
 target

Modified: directory/studio/trunk/org.apache.commons.lang/pom.xml
URL: http://svn.apache.org/viewvc/directory/studio/trunk/org.apache.commons.lang/pom.xml?rev=984799&r1=984798&r2=984799&view=diff
==============================================================================
--- directory/studio/trunk/org.apache.commons.lang/pom.xml (original)
+++ directory/studio/trunk/org.apache.commons.lang/pom.xml Thu Aug 12 14:22:27 2010
@@ -40,15 +40,32 @@
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-eclipse-plugin</artifactId>
         <configuration>
-          <skip>true</skip>
+          <skip>false</skip>
+          <pde>true</pde>
+          <additionalProjectnatures>
+            <projectnature>org.eclipse.pde.PluginNature</projectnature>
+            <projectnature>org.eclipse.jdt.core.javanature</projectnature>
+          </additionalProjectnatures>
+          <classpathContainers>
+            <classpathContainer>org.eclipse.jdt.launching.JRE_CONTAINER</classpathContainer>
+            <classpathContainer>org.eclipse.pde.core.requiredPlugins</classpathContainer>
+          </classpathContainers>
         </configuration>
       </plugin>
       <plugin>
         <groupId>org.apache.directory.studio</groupId>
         <artifactId>studio-maven-plugin</artifactId>
         <configuration>
-          <skip>true</skip>
+          <skip>false</skip>
+          <createManifest>true</createManifest>
         </configuration>
+        <executions>
+          <execution>
+            <goals>
+              <goal>prepare-jar-package</goal>
+            </goals>
+          </execution>
+        </executions>
       </plugin>
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
@@ -67,11 +84,13 @@
         <extensions>true</extensions>
         <configuration>
           <manifestLocation>META-INF</manifestLocation>
-          <instructions>            
+          <instructions>
             <Bundle-SymbolicName>${artifactId}</Bundle-SymbolicName>
+            <Embed-Dependency>*;scope=compile|runtime</Embed-Dependency>
+            <Embed-Directory>lib</Embed-Directory>
+            <Embed-StripGroup>true</Embed-StripGroup>
             <Export-Package>!org.apache.commons.lang.enum,*</Export-Package>
             <Import-Package>!</Import-Package>
-            <Private-Package>!</Private-Package>
           </instructions>
         </configuration>
         <executions>
@@ -84,31 +103,6 @@
           </execution>
         </executions>
       </plugin>
-      
-      <!-- Unpack the jar -->
-      <plugin>
-        <artifactId>maven-dependency-plugin</artifactId>
-        <executions>
-          <execution>
-            <id>unpack-apache-directory-studio-plugin</id>
-            <phase>generate-resources</phase>
-            <goals>
-              <goal>unpack</goal>
-            </goals>
-            <configuration>
-              <overWrite>true</overWrite>
-              <outputDirectory>src/main/resources</outputDirectory>
-              <artifactItems>
-                <artifactItem>
-                  <groupId>commons-lang</groupId>
-                  <artifactId>commons-lang</artifactId>
-                  <excludes>META-INF/**</excludes>
-                </artifactItem>
-              </artifactItems>
-            </configuration>
-          </execution>
-        </executions>
-      </plugin>
       <!-- No tests to run -->
       <plugin>
         <artifactId>maven-surefire-plugin</artifactId>
@@ -119,4 +113,11 @@
     </plugins>
   </build>
   
+  <dependencies>
+    <dependency>
+      <groupId>commons-lang</groupId>
+      <artifactId>commons-lang</artifactId>
+    </dependency>
+  </dependencies>
+  
 </project>

Propchange: directory/studio/trunk/org.apache.commons.logging/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Thu Aug 12 14:22:27 2010
@@ -1,3 +1,6 @@
+.classpath
+.project
+.settings
+lib
 META-INF
-src
 target

Modified: directory/studio/trunk/org.apache.commons.logging/pom.xml
URL: http://svn.apache.org/viewvc/directory/studio/trunk/org.apache.commons.logging/pom.xml?rev=984799&r1=984798&r2=984799&view=diff
==============================================================================
--- directory/studio/trunk/org.apache.commons.logging/pom.xml (original)
+++ directory/studio/trunk/org.apache.commons.logging/pom.xml Thu Aug 12 14:22:27 2010
@@ -40,15 +40,32 @@
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-eclipse-plugin</artifactId>
         <configuration>
-          <skip>true</skip>
+          <skip>false</skip>
+          <pde>true</pde>
+          <additionalProjectnatures>
+            <projectnature>org.eclipse.pde.PluginNature</projectnature>
+            <projectnature>org.eclipse.jdt.core.javanature</projectnature>
+          </additionalProjectnatures>
+          <classpathContainers>
+            <classpathContainer>org.eclipse.jdt.launching.JRE_CONTAINER</classpathContainer>
+            <classpathContainer>org.eclipse.pde.core.requiredPlugins</classpathContainer>
+          </classpathContainers>
         </configuration>
       </plugin>
       <plugin>
         <groupId>org.apache.directory.studio</groupId>
         <artifactId>studio-maven-plugin</artifactId>
         <configuration>
-          <skip>true</skip>
+          <skip>false</skip>
+          <createManifest>true</createManifest>
         </configuration>
+        <executions>
+          <execution>
+            <goals>
+              <goal>prepare-jar-package</goal>
+            </goals>
+          </execution>
+        </executions>
       </plugin>
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
@@ -67,11 +84,13 @@
         <extensions>true</extensions>
         <configuration>
           <manifestLocation>META-INF</manifestLocation>
-          <instructions>            
+          <instructions>
             <Bundle-SymbolicName>${artifactId}</Bundle-SymbolicName>
+            <Embed-Dependency>*;scope=compile|runtime</Embed-Dependency>
+            <Embed-Directory>lib</Embed-Directory>
+            <Embed-StripGroup>true</Embed-StripGroup>
             <Export-Package>*</Export-Package>
             <Import-Package>!</Import-Package>
-            <Private-Package>!</Private-Package>
           </instructions>
         </configuration>
         <executions>
@@ -84,31 +103,6 @@
           </execution>
         </executions>
       </plugin>
-      
-      <!-- Unpack the jar -->
-      <plugin>
-        <artifactId>maven-dependency-plugin</artifactId>
-        <executions>
-          <execution>
-            <id>unpack-apache-directory-studio-plugin</id>
-            <phase>generate-resources</phase>
-            <goals>
-              <goal>unpack</goal>
-            </goals>
-            <configuration>
-              <overWrite>true</overWrite>
-              <outputDirectory>src/main/resources</outputDirectory>
-              <artifactItems>
-                <artifactItem>
-                  <groupId>commons-logging</groupId>
-                  <artifactId>commons-logging</artifactId>
-                  <excludes>META-INF/**</excludes>
-                </artifactItem>
-              </artifactItems>
-            </configuration>
-          </execution>
-        </executions>
-      </plugin>
       <!-- No tests to run -->
       <plugin>
         <artifactId>maven-surefire-plugin</artifactId>
@@ -119,4 +113,11 @@
     </plugins>
   </build>
   
+  <dependencies>
+    <dependency>
+      <groupId>commons-logging</groupId>
+      <artifactId>commons-logging</artifactId>
+    </dependency>
+  </dependencies>
+  
 </project>

Propchange: directory/studio/trunk/org.apache.directory.shared.asn1/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Thu Aug 12 14:22:27 2010
@@ -1,3 +1,6 @@
+.classpath
+.project
+.settings
+lib
 META-INF
-src
 target

Modified: directory/studio/trunk/org.apache.directory.shared.asn1/pom.xml
URL: http://svn.apache.org/viewvc/directory/studio/trunk/org.apache.directory.shared.asn1/pom.xml?rev=984799&r1=984798&r2=984799&view=diff
==============================================================================
--- directory/studio/trunk/org.apache.directory.shared.asn1/pom.xml (original)
+++ directory/studio/trunk/org.apache.directory.shared.asn1/pom.xml Thu Aug 12 14:22:27 2010
@@ -40,15 +40,32 @@
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-eclipse-plugin</artifactId>
         <configuration>
-          <skip>true</skip>
+          <skip>false</skip>
+          <pde>true</pde>
+          <additionalProjectnatures>
+            <projectnature>org.eclipse.pde.PluginNature</projectnature>
+            <projectnature>org.eclipse.jdt.core.javanature</projectnature>
+          </additionalProjectnatures>
+          <classpathContainers>
+            <classpathContainer>org.eclipse.jdt.launching.JRE_CONTAINER</classpathContainer>
+            <classpathContainer>org.eclipse.pde.core.requiredPlugins</classpathContainer>
+          </classpathContainers>
         </configuration>
       </plugin>
       <plugin>
         <groupId>org.apache.directory.studio</groupId>
         <artifactId>studio-maven-plugin</artifactId>
         <configuration>
-          <skip>true</skip>
+          <skip>false</skip>
+          <createManifest>true</createManifest>
         </configuration>
+        <executions>
+          <execution>
+            <goals>
+              <goal>prepare-jar-package</goal>
+            </goals>
+          </execution>
+        </executions>
       </plugin>
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
@@ -67,14 +84,16 @@
         <extensions>true</extensions>
         <configuration>
           <manifestLocation>META-INF</manifestLocation>
-          <instructions>            
+          <instructions>
             <Bundle-SymbolicName>${artifactId}</Bundle-SymbolicName>
             <Require-Bundle>org.apache.logging.log4j;bundle-version="${org.apache.logging.log4j.version}",
  org.slf4j.api;bundle-version="${org.slf4j.version}",
  org.slf4j.log4j12;bundle-version="${org.slf4j.version}"</Require-Bundle>
+            <Embed-Dependency>*;scope=compile|runtime</Embed-Dependency>
+            <Embed-Directory>lib</Embed-Directory>
+            <Embed-StripGroup>true</Embed-StripGroup>
             <Export-Package>*</Export-Package>
             <Import-Package>!</Import-Package>
-            <Private-Package>!</Private-Package>
           </instructions>
         </configuration>
         <executions>
@@ -87,31 +106,6 @@
           </execution>
         </executions>
       </plugin>
-      
-      <!-- Unpack the jar -->
-      <plugin>
-        <artifactId>maven-dependency-plugin</artifactId>
-        <executions>
-          <execution>
-            <id>unpack-apache-directory-studio-plugin</id>
-            <phase>generate-resources</phase>
-            <goals>
-              <goal>unpack</goal>
-            </goals>
-            <configuration>
-              <overWrite>true</overWrite>
-              <outputDirectory>src/main/resources</outputDirectory>
-              <artifactItems>
-                <artifactItem>
-                  <groupId>org.apache.directory.shared</groupId>
-                  <artifactId>shared-asn1</artifactId>
-                  <excludes>META-INF/**</excludes>
-                </artifactItem>
-              </artifactItems>
-            </configuration>
-          </execution>
-        </executions>
-      </plugin>
       <!-- No tests to run -->
       <plugin>
         <artifactId>maven-surefire-plugin</artifactId>
@@ -124,8 +118,14 @@
   
   <dependencies>
     <dependency>
-      <groupId>org.apache.directory.studio</groupId>
-      <artifactId>org.slf4j.api</artifactId>
+      <groupId>org.apache.directory.shared</groupId>
+      <artifactId>shared-asn1</artifactId>
+      <exclusions>
+        <exclusion>
+          <groupId>org.slf4j</groupId>
+          <artifactId>slf4j-api</artifactId>
+        </exclusion>
+      </exclusions>
     </dependency>
   </dependencies>
   

Propchange: directory/studio/trunk/org.apache.directory.shared.dsmlparser/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Thu Aug 12 14:22:27 2010
@@ -1,3 +1,6 @@
+.classpath
+.project
+.settings
+lib
 META-INF
-src
 target

Modified: directory/studio/trunk/org.apache.directory.shared.dsmlparser/pom.xml
URL: http://svn.apache.org/viewvc/directory/studio/trunk/org.apache.directory.shared.dsmlparser/pom.xml?rev=984799&r1=984798&r2=984799&view=diff
==============================================================================
--- directory/studio/trunk/org.apache.directory.shared.dsmlparser/pom.xml (original)
+++ directory/studio/trunk/org.apache.directory.shared.dsmlparser/pom.xml Thu Aug 12 14:22:27 2010
@@ -40,15 +40,32 @@
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-eclipse-plugin</artifactId>
         <configuration>
-          <skip>true</skip>
+          <skip>false</skip>
+          <pde>true</pde>
+          <additionalProjectnatures>
+            <projectnature>org.eclipse.pde.PluginNature</projectnature>
+            <projectnature>org.eclipse.jdt.core.javanature</projectnature>
+          </additionalProjectnatures>
+          <classpathContainers>
+            <classpathContainer>org.eclipse.jdt.launching.JRE_CONTAINER</classpathContainer>
+            <classpathContainer>org.eclipse.pde.core.requiredPlugins</classpathContainer>
+          </classpathContainers>
         </configuration>
       </plugin>
       <plugin>
         <groupId>org.apache.directory.studio</groupId>
         <artifactId>studio-maven-plugin</artifactId>
         <configuration>
-          <skip>true</skip>
+          <skip>false</skip>
+          <createManifest>true</createManifest>
         </configuration>
+        <executions>
+          <execution>
+            <goals>
+              <goal>prepare-jar-package</goal>
+            </goals>
+          </execution>
+        </executions>
       </plugin>
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
@@ -67,7 +84,7 @@
         <extensions>true</extensions>
         <configuration>
           <manifestLocation>META-INF</manifestLocation>
-          <instructions>            
+          <instructions>
             <Bundle-SymbolicName>${artifactId}</Bundle-SymbolicName>
             <Require-Bundle>org.antlr.antlr;bundle-version="${org.antlr.version}",
  org.apache.commons.collections;bundle-version="${org.apache.commons.collections.version}",
@@ -79,9 +96,11 @@
  org.xpp3.xpp3;bundle-version="${org.xpp3.validversion}",
  org.slf4j.api;bundle-version="${org.slf4j.version}",
  org.slf4j.log4j12;bundle-version="${org.slf4j.version}"</Require-Bundle>
+            <Embed-Dependency>*;scope=compile|runtime</Embed-Dependency>
+            <Embed-Directory>lib</Embed-Directory>
+            <Embed-StripGroup>true</Embed-StripGroup>
             <Export-Package>*</Export-Package>
             <Import-Package>!</Import-Package>
-            <Private-Package>!</Private-Package>
           </instructions>
         </configuration>
         <executions>
@@ -94,31 +113,6 @@
           </execution>
         </executions>
       </plugin>
-      
-      <!-- Unpack the jar -->
-      <plugin>
-        <artifactId>maven-dependency-plugin</artifactId>
-        <executions>
-          <execution>
-            <id>unpack-apache-directory-studio-plugin</id>
-            <phase>generate-resources</phase>
-            <goals>
-              <goal>unpack</goal>
-            </goals>
-            <configuration>
-              <overWrite>true</overWrite>
-              <outputDirectory>src/main/resources</outputDirectory>
-              <artifactItems>
-                <artifactItem>
-                  <groupId>org.apache.directory.shared</groupId>
-                  <artifactId>shared-dsml-parser</artifactId>
-                  <excludes>META-INF/**</excludes>
-                </artifactItem>
-              </artifactItems>
-            </configuration>
-          </execution>
-        </executions>
-      </plugin>
       <!-- No tests to run -->
       <plugin>
         <artifactId>maven-surefire-plugin</artifactId>
@@ -131,32 +125,38 @@
   
   <dependencies>
     <dependency>
-      <groupId>org.apache.directory.studio</groupId>
-      <artifactId>org.antlr.antlr</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.directory.studio</groupId>
-      <artifactId>org.apache.commons.collections</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.directory.studio</groupId>
-      <artifactId>org.apache.directory.shared.asn1</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.directory.studio</groupId>
-      <artifactId>org.apache.directory.shared.ldap</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.directory.studio</groupId>
-      <artifactId>org.apache.directory.shared.ldapconstants</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.directory.studio</groupId>
-      <artifactId>org.dom4j.dom4j</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.directory.studio</groupId>
-      <artifactId>org.xpp3.xpp3</artifactId>
+      <groupId>org.apache.directory.shared</groupId>
+      <artifactId>shared-dsml-parser</artifactId>
+      <exclusions>
+        <exclusion>
+          <groupId>antlr</groupId>
+          <artifactId>antlr</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>commons-collections</groupId>
+          <artifactId>commons-collections</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>dom4j</groupId>
+          <artifactId>dom4j</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>org.apache.directory.shared</groupId>
+          <artifactId>shared-asn1</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>org.apache.directory.shared</groupId>
+          <artifactId>shared-ldap</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>org.slf4j</groupId>
+          <artifactId>slf4j-api</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>xpp3</groupId>
+          <artifactId>xpp3</artifactId>
+        </exclusion>
+      </exclusions>
     </dependency>
   </dependencies>
   

Propchange: directory/studio/trunk/org.apache.directory.shared.ldap/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Thu Aug 12 14:22:27 2010
@@ -1,3 +1,6 @@
+.classpath
+.project
+.settings
+lib
 META-INF
-src
 target

Modified: directory/studio/trunk/org.apache.directory.shared.ldap/pom.xml
URL: http://svn.apache.org/viewvc/directory/studio/trunk/org.apache.directory.shared.ldap/pom.xml?rev=984799&r1=984798&r2=984799&view=diff
==============================================================================
--- directory/studio/trunk/org.apache.directory.shared.ldap/pom.xml (original)
+++ directory/studio/trunk/org.apache.directory.shared.ldap/pom.xml Thu Aug 12 14:22:27 2010
@@ -40,15 +40,32 @@
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-eclipse-plugin</artifactId>
         <configuration>
-          <skip>true</skip>
+          <skip>false</skip>
+          <pde>true</pde>
+          <additionalProjectnatures>
+            <projectnature>org.eclipse.pde.PluginNature</projectnature>
+            <projectnature>org.eclipse.jdt.core.javanature</projectnature>
+          </additionalProjectnatures>
+          <classpathContainers>
+            <classpathContainer>org.eclipse.jdt.launching.JRE_CONTAINER</classpathContainer>
+            <classpathContainer>org.eclipse.pde.core.requiredPlugins</classpathContainer>
+          </classpathContainers>
         </configuration>
       </plugin>
       <plugin>
         <groupId>org.apache.directory.studio</groupId>
         <artifactId>studio-maven-plugin</artifactId>
         <configuration>
-          <skip>true</skip>
+          <skip>false</skip>
+          <createManifest>true</createManifest>
         </configuration>
+        <executions>
+          <execution>
+            <goals>
+              <goal>prepare-jar-package</goal>
+            </goals>
+          </execution>
+        </executions>
       </plugin>
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
@@ -67,7 +84,7 @@
         <extensions>true</extensions>
         <configuration>
           <manifestLocation>META-INF</manifestLocation>
-          <instructions>            
+          <instructions>
             <Bundle-SymbolicName>${artifactId}</Bundle-SymbolicName>
             <Require-Bundle>org.antlr.antlr;bundle-version="${org.antlr.version}",
  org.apache.commons.collections;bundle-version="${org.apache.commons.collections.version}",
@@ -76,9 +93,11 @@
  org.apache.logging.log4j;bundle-version="${org.apache.logging.log4j.version}",
  org.slf4j.api;bundle-version="${org.slf4j.version}",
  org.slf4j.log4j12;bundle-version="${org.slf4j.version}"</Require-Bundle>
+            <Embed-Dependency>*;scope=compile|runtime</Embed-Dependency>
+            <Embed-Directory>lib</Embed-Directory>
+            <Embed-StripGroup>true</Embed-StripGroup>
             <Export-Package>*</Export-Package>
-            <Import-Package>org.slf4j.impl;version="${org.slf4j.version}"</Import-Package>
-            <Private-Package>!</Private-Package>
+            <Import-Package>!</Import-Package>
           </instructions>
         </configuration>
         <executions>
@@ -91,31 +110,6 @@
           </execution>
         </executions>
       </plugin>
-      
-      <!-- Unpack the jar -->
-      <plugin>
-        <artifactId>maven-dependency-plugin</artifactId>
-        <executions>
-          <execution>
-            <id>unpack-apache-directory-studio-plugin</id>
-            <phase>generate-resources</phase>
-            <goals>
-              <goal>unpack</goal>
-            </goals>
-            <configuration>
-              <overWrite>true</overWrite>
-              <outputDirectory>src/main/resources</outputDirectory>
-              <artifactItems>
-                <artifactItem>
-                  <groupId>org.apache.directory.shared</groupId>
-                  <artifactId>shared-ldap</artifactId>
-                  <excludes>META-INF/**</excludes>
-                </artifactItem>
-              </artifactItems>
-            </configuration>
-          </execution>
-        </executions>
-      </plugin>
       <!-- No tests to run -->
       <plugin>
         <artifactId>maven-surefire-plugin</artifactId>
@@ -128,28 +122,34 @@
   
   <dependencies>
     <dependency>
-      <groupId>org.apache.directory.studio</groupId>
-      <artifactId>org.antlr.antlr</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.directory.studio</groupId>
-      <artifactId>org.apache.commons.collections</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.directory.studio</groupId>
-      <artifactId>org.apache.directory.shared.asn1</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.directory.studio</groupId>
-      <artifactId>org.apache.directory.shared.ldapconstants</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.directory.studio</groupId>
-      <artifactId>org.slf4j.api</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.directory.studio</groupId>
-      <artifactId>org.slf4j.log4j12</artifactId>
+      <groupId>org.apache.directory.shared</groupId>
+      <artifactId>shared-ldap</artifactId>
+      <exclusions>
+        <exclusion>
+          <groupId>antlr</groupId>
+          <artifactId>antlr</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>commons-lang</groupId>
+          <artifactId>commons-lang</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>commons-collections</groupId>
+          <artifactId>commons-collections</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>org.apache.directory.shared</groupId>
+          <artifactId>shared-asn1</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>org.apache.directory.shared</groupId>
+          <artifactId>shared-ldap-constants</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>org.slf4j</groupId>
+          <artifactId>slf4j-api</artifactId>
+        </exclusion>
+      </exclusions>
     </dependency>
   </dependencies>
   

Propchange: directory/studio/trunk/org.apache.directory.shared.ldapconstants/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Thu Aug 12 14:22:27 2010
@@ -1,3 +1,6 @@
+.classpath
+.project
+.settings
+lib
 META-INF
-src
 target

Modified: directory/studio/trunk/org.apache.directory.shared.ldapconstants/pom.xml
URL: http://svn.apache.org/viewvc/directory/studio/trunk/org.apache.directory.shared.ldapconstants/pom.xml?rev=984799&r1=984798&r2=984799&view=diff
==============================================================================
--- directory/studio/trunk/org.apache.directory.shared.ldapconstants/pom.xml (original)
+++ directory/studio/trunk/org.apache.directory.shared.ldapconstants/pom.xml Thu Aug 12 14:22:27 2010
@@ -40,15 +40,32 @@
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-eclipse-plugin</artifactId>
         <configuration>
-          <skip>true</skip>
+          <skip>false</skip>
+          <pde>true</pde>
+          <additionalProjectnatures>
+            <projectnature>org.eclipse.pde.PluginNature</projectnature>
+            <projectnature>org.eclipse.jdt.core.javanature</projectnature>
+          </additionalProjectnatures>
+          <classpathContainers>
+            <classpathContainer>org.eclipse.jdt.launching.JRE_CONTAINER</classpathContainer>
+            <classpathContainer>org.eclipse.pde.core.requiredPlugins</classpathContainer>
+          </classpathContainers>
         </configuration>
       </plugin>
       <plugin>
         <groupId>org.apache.directory.studio</groupId>
         <artifactId>studio-maven-plugin</artifactId>
         <configuration>
-          <skip>true</skip>
+          <skip>false</skip>
+          <createManifest>true</createManifest>
         </configuration>
+        <executions>
+          <execution>
+            <goals>
+              <goal>prepare-jar-package</goal>
+            </goals>
+          </execution>
+        </executions>
       </plugin>
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
@@ -67,14 +84,16 @@
         <extensions>true</extensions>
         <configuration>
           <manifestLocation>META-INF</manifestLocation>
-          <instructions>            
+          <instructions>
             <Bundle-SymbolicName>${artifactId}</Bundle-SymbolicName>
             <Require-Bundle>org.apache.logging.log4j;bundle-version="${org.apache.logging.log4j.version}",
  org.slf4j.api;bundle-version="${org.slf4j.version}",
  org.slf4j.log4j12;bundle-version="${org.slf4j.version}"</Require-Bundle>
+            <Embed-Dependency>*;scope=compile|runtime</Embed-Dependency>
+            <Embed-Directory>lib</Embed-Directory>
+            <Embed-StripGroup>true</Embed-StripGroup>
             <Export-Package>*</Export-Package>
             <Import-Package>!</Import-Package>
-            <Private-Package>!</Private-Package>
           </instructions>
         </configuration>
         <executions>
@@ -87,31 +106,6 @@
           </execution>
         </executions>
       </plugin>
-      
-      <!-- Unpack the jar -->
-      <plugin>
-        <artifactId>maven-dependency-plugin</artifactId>
-        <executions>
-          <execution>
-            <id>unpack-apache-directory-studio-plugin</id>
-            <phase>generate-resources</phase>
-            <goals>
-              <goal>unpack</goal>
-            </goals>
-            <configuration>
-              <overWrite>true</overWrite>
-              <outputDirectory>src/main/resources</outputDirectory>
-              <artifactItems>
-                <artifactItem>
-                  <groupId>org.apache.directory.shared</groupId>
-                  <artifactId>shared-ldap-constants</artifactId>
-                  <excludes>META-INF/**</excludes>
-                </artifactItem>
-              </artifactItems>
-            </configuration>
-          </execution>
-        </executions>
-      </plugin>
       <!-- No tests to run -->
       <plugin>
         <artifactId>maven-surefire-plugin</artifactId>
@@ -124,8 +118,14 @@
   
   <dependencies>
     <dependency>
-      <groupId>org.apache.directory.studio</groupId>
-      <artifactId>org.slf4j.api</artifactId>
+      <groupId>org.apache.directory.shared</groupId>
+      <artifactId>shared-ldap-constants</artifactId>
+      <exclusions>
+        <exclusion>
+          <groupId>org.slf4j</groupId>
+          <artifactId>slf4j-api</artifactId>
+        </exclusion>
+      </exclusions>
     </dependency>
   </dependencies>
   

Propchange: directory/studio/trunk/org.apache.httpcomponents.httpclient/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Thu Aug 12 14:22:27 2010
@@ -1,3 +1,6 @@
+.classpath
+.project
+.settings
+lib
 META-INF
-src
 target

Modified: directory/studio/trunk/org.apache.httpcomponents.httpclient/pom.xml
URL: http://svn.apache.org/viewvc/directory/studio/trunk/org.apache.httpcomponents.httpclient/pom.xml?rev=984799&r1=984798&r2=984799&view=diff
==============================================================================
--- directory/studio/trunk/org.apache.httpcomponents.httpclient/pom.xml (original)
+++ directory/studio/trunk/org.apache.httpcomponents.httpclient/pom.xml Thu Aug 12 14:22:27 2010
@@ -40,15 +40,32 @@
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-eclipse-plugin</artifactId>
         <configuration>
-          <skip>true</skip>
+          <skip>false</skip>
+          <pde>true</pde>
+          <additionalProjectnatures>
+            <projectnature>org.eclipse.pde.PluginNature</projectnature>
+            <projectnature>org.eclipse.jdt.core.javanature</projectnature>
+          </additionalProjectnatures>
+          <classpathContainers>
+            <classpathContainer>org.eclipse.jdt.launching.JRE_CONTAINER</classpathContainer>
+            <classpathContainer>org.eclipse.pde.core.requiredPlugins</classpathContainer>
+          </classpathContainers>
         </configuration>
       </plugin>
       <plugin>
         <groupId>org.apache.directory.studio</groupId>
         <artifactId>studio-maven-plugin</artifactId>
         <configuration>
-          <skip>true</skip>
+          <skip>false</skip>
+          <createManifest>true</createManifest>
         </configuration>
+        <executions>
+          <execution>
+            <goals>
+              <goal>prepare-jar-package</goal>
+            </goals>
+          </execution>
+        </executions>
       </plugin>
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
@@ -67,14 +84,16 @@
         <extensions>true</extensions>
         <configuration>
           <manifestLocation>META-INF</manifestLocation>
-          <instructions>            
+          <instructions>
             <Bundle-SymbolicName>${artifactId}</Bundle-SymbolicName>
             <Require-Bundle>org.apache.commons.codec;bundle-version="${org.apache.commons.codec.version}",
  org.apache.commons.logging;bundle-version="${org.apache.commons.logging.version}",
  org.apache.httpcomponents.httpcore;bundle-version="${org.apache.httpcomponents.version}"</Require-Bundle>
+            <Embed-Dependency>*;scope=compile|runtime</Embed-Dependency>
+            <Embed-Directory>lib</Embed-Directory>
+            <Embed-StripGroup>true</Embed-StripGroup>
             <Export-Package>*</Export-Package>
             <Import-Package>!</Import-Package>
-            <Private-Package>!</Private-Package>
           </instructions>
         </configuration>
         <executions>
@@ -87,31 +106,6 @@
           </execution>
         </executions>
       </plugin>
-      
-      <!-- Unpack the jar -->
-      <plugin>
-        <artifactId>maven-dependency-plugin</artifactId>
-        <executions>
-          <execution>
-            <id>unpack-apache-directory-studio-plugin</id>
-            <phase>generate-resources</phase>
-            <goals>
-              <goal>unpack</goal>
-            </goals>
-            <configuration>
-              <overWrite>true</overWrite>
-              <outputDirectory>src/main/resources</outputDirectory>
-              <artifactItems>
-                <artifactItem>
-                  <groupId>org.apache.httpcomponents</groupId>
-                  <artifactId>httpclient</artifactId>
-                  <excludes>META-INF/**</excludes>
-                </artifactItem>
-              </artifactItems>
-            </configuration>
-          </execution>
-        </executions>
-      </plugin>
       <!-- No tests to run -->
       <plugin>
         <artifactId>maven-surefire-plugin</artifactId>
@@ -124,16 +118,22 @@
   
   <dependencies>
     <dependency>
-      <groupId>org.apache.directory.studio</groupId>
-      <artifactId>org.apache.commons.codec</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.directory.studio</groupId>
-      <artifactId>org.apache.commons.logging</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.directory.studio</groupId>
-      <artifactId>org.apache.httpcomponents.httpcore</artifactId>
+      <groupId>org.apache.httpcomponents</groupId>
+      <artifactId>httpclient</artifactId>
+      <exclusions>
+        <exclusion>
+          <groupId>commons-codec</groupId>
+          <artifactId>commons-codec</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>commons-logging</groupId>
+          <artifactId>commons-logging</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>org.apache.httpcomponents</groupId>
+          <artifactId>httpcore</artifactId>
+        </exclusion>
+      </exclusions>
     </dependency>
   </dependencies>
   

Propchange: directory/studio/trunk/org.apache.httpcomponents.httpcore/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Thu Aug 12 14:22:27 2010
@@ -1,3 +1,6 @@
+.classpath
+.project
+.settings
+lib
 META-INF
-src
 target

Modified: directory/studio/trunk/org.apache.httpcomponents.httpcore/pom.xml
URL: http://svn.apache.org/viewvc/directory/studio/trunk/org.apache.httpcomponents.httpcore/pom.xml?rev=984799&r1=984798&r2=984799&view=diff
==============================================================================
--- directory/studio/trunk/org.apache.httpcomponents.httpcore/pom.xml (original)
+++ directory/studio/trunk/org.apache.httpcomponents.httpcore/pom.xml Thu Aug 12 14:22:27 2010
@@ -40,15 +40,32 @@
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-eclipse-plugin</artifactId>
         <configuration>
-          <skip>true</skip>
+          <skip>false</skip>
+          <pde>true</pde>
+          <additionalProjectnatures>
+            <projectnature>org.eclipse.pde.PluginNature</projectnature>
+            <projectnature>org.eclipse.jdt.core.javanature</projectnature>
+          </additionalProjectnatures>
+          <classpathContainers>
+            <classpathContainer>org.eclipse.jdt.launching.JRE_CONTAINER</classpathContainer>
+            <classpathContainer>org.eclipse.pde.core.requiredPlugins</classpathContainer>
+          </classpathContainers>
         </configuration>
       </plugin>
       <plugin>
         <groupId>org.apache.directory.studio</groupId>
         <artifactId>studio-maven-plugin</artifactId>
         <configuration>
-          <skip>true</skip>
+          <skip>false</skip>
+          <createManifest>true</createManifest>
         </configuration>
+        <executions>
+          <execution>
+            <goals>
+              <goal>prepare-jar-package</goal>
+            </goals>
+          </execution>
+        </executions>
       </plugin>
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
@@ -67,11 +84,13 @@
         <extensions>true</extensions>
         <configuration>
           <manifestLocation>META-INF</manifestLocation>
-          <instructions>            
+          <instructions>
             <Bundle-SymbolicName>${artifactId}</Bundle-SymbolicName>
+            <Embed-Dependency>*;scope=compile|runtime</Embed-Dependency>
+            <Embed-Directory>lib</Embed-Directory>
+            <Embed-StripGroup>true</Embed-StripGroup>
             <Export-Package>*</Export-Package>
             <Import-Package>!</Import-Package>
-            <Private-Package>!</Private-Package>
           </instructions>
         </configuration>
         <executions>
@@ -84,31 +103,6 @@
           </execution>
         </executions>
       </plugin>
-      
-      <!-- Unpack the jar -->
-      <plugin>
-        <artifactId>maven-dependency-plugin</artifactId>
-        <executions>
-          <execution>
-            <id>unpack-apache-directory-studio-plugin</id>
-            <phase>generate-resources</phase>
-            <goals>
-              <goal>unpack</goal>
-            </goals>
-            <configuration>
-              <overWrite>true</overWrite>
-              <outputDirectory>src/main/resources</outputDirectory>
-              <artifactItems>
-                <artifactItem>
-                  <groupId>org.apache.httpcomponents</groupId>
-                  <artifactId>httpcore</artifactId>
-                  <excludes>META-INF/**</excludes>
-                </artifactItem>
-              </artifactItems>
-            </configuration>
-          </execution>
-        </executions>
-      </plugin>
       <!-- No tests to run -->
       <plugin>
         <artifactId>maven-surefire-plugin</artifactId>
@@ -119,4 +113,11 @@
     </plugins>
   </build>
   
+  <dependencies>
+    <dependency>
+      <groupId>org.apache.httpcomponents</groupId>
+      <artifactId>httpcore</artifactId>
+    </dependency>
+  </dependencies>
+  
 </project>

Propchange: directory/studio/trunk/org.apache.logging.log4j/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Thu Aug 12 14:22:27 2010
@@ -1,3 +1,6 @@
+.classpath
+.project
+.settings
+lib
 META-INF
-src
 target

Modified: directory/studio/trunk/org.apache.logging.log4j/.classpath
URL: http://svn.apache.org/viewvc/directory/studio/trunk/org.apache.logging.log4j/.classpath?rev=984799&r1=984798&r2=984799&view=diff
==============================================================================
--- directory/studio/trunk/org.apache.logging.log4j/.classpath (original)
+++ directory/studio/trunk/org.apache.logging.log4j/.classpath Thu Aug 12 14:22:27 2010
@@ -1,8 +1,7 @@
-<?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry excluding="**/*.java" kind="src" path="target/maven-shared-archive-resources"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry kind="lib" path="src/main/resources" exported="true"/>
-	<classpathentry kind="output" path="target/classes"/>
-</classpath>
+  <classpathentry excluding="**/*.java" path="target/maven-shared-archive-resources" kind="src"/>
+  <classpathentry path="target/classes" kind="output"/>
+  <classpathentry path="org.eclipse.jdt.launching.JRE_CONTAINER" kind="con"/>
+  <classpathentry path="org.eclipse.pde.core.requiredPlugins" kind="con"/>
+  <classpathentry path="lib/log4j-1.2.14.jar" exported="true" kind="lib"/>
+</classpath>
\ No newline at end of file

Modified: directory/studio/trunk/org.apache.logging.log4j/pom.xml
URL: http://svn.apache.org/viewvc/directory/studio/trunk/org.apache.logging.log4j/pom.xml?rev=984799&r1=984798&r2=984799&view=diff
==============================================================================
--- directory/studio/trunk/org.apache.logging.log4j/pom.xml (original)
+++ directory/studio/trunk/org.apache.logging.log4j/pom.xml Thu Aug 12 14:22:27 2010
@@ -40,15 +40,32 @@
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-eclipse-plugin</artifactId>
         <configuration>
-          <skip>true</skip>
+          <skip>false</skip>
+          <pde>true</pde>
+          <additionalProjectnatures>
+            <projectnature>org.eclipse.pde.PluginNature</projectnature>
+            <projectnature>org.eclipse.jdt.core.javanature</projectnature>
+          </additionalProjectnatures>
+          <classpathContainers>
+            <classpathContainer>org.eclipse.jdt.launching.JRE_CONTAINER</classpathContainer>
+            <classpathContainer>org.eclipse.pde.core.requiredPlugins</classpathContainer>
+          </classpathContainers>
         </configuration>
       </plugin>
       <plugin>
         <groupId>org.apache.directory.studio</groupId>
         <artifactId>studio-maven-plugin</artifactId>
         <configuration>
-          <skip>true</skip>
+          <skip>false</skip>
+          <createManifest>true</createManifest>
         </configuration>
+        <executions>
+          <execution>
+            <goals>
+              <goal>prepare-jar-package</goal>
+            </goals>
+          </execution>
+        </executions>
       </plugin>
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
@@ -67,11 +84,13 @@
         <extensions>true</extensions>
         <configuration>
           <manifestLocation>META-INF</manifestLocation>
-          <instructions>            
+          <instructions>
             <Bundle-SymbolicName>${artifactId}</Bundle-SymbolicName>
+            <Embed-Dependency>*;scope=compile|runtime</Embed-Dependency>
+            <Embed-Directory>lib</Embed-Directory>
+            <Embed-StripGroup>true</Embed-StripGroup>
             <Export-Package>*</Export-Package>
             <Import-Package>!</Import-Package>
-            <Private-Package>!</Private-Package>
           </instructions>
         </configuration>
         <executions>
@@ -84,31 +103,6 @@
           </execution>
         </executions>
       </plugin>
-      
-      <!-- Unpack the jar -->
-      <plugin>
-        <artifactId>maven-dependency-plugin</artifactId>
-        <executions>
-          <execution>
-            <id>unpack-apache-directory-studio-plugin</id>
-            <phase>generate-resources</phase>
-            <goals>
-              <goal>unpack</goal>
-            </goals>
-            <configuration>
-              <overWrite>true</overWrite>
-              <outputDirectory>src/main/resources</outputDirectory>
-              <artifactItems>
-                <artifactItem>
-                  <groupId>log4j</groupId>
-                  <artifactId>log4j</artifactId>
-                  <excludes>META-INF/**</excludes>
-                </artifactItem>
-              </artifactItems>
-            </configuration>
-          </execution>
-        </executions>
-      </plugin>
       <!-- No tests to run -->
       <plugin>
         <artifactId>maven-surefire-plugin</artifactId>
@@ -119,4 +113,11 @@
     </plugins>
   </build>
   
+  <dependencies>
+    <dependency>
+      <groupId>log4j</groupId>
+      <artifactId>log4j</artifactId>
+    </dependency>
+  </dependencies>
+  
 </project>

Propchange: directory/studio/trunk/org.apache.mina.core/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Thu Aug 12 14:22:27 2010
@@ -1,3 +1,6 @@
+.classpath
+.project
+.settings
+lib
 META-INF
 target
-src

Modified: directory/studio/trunk/org.apache.mina.core/pom.xml
URL: http://svn.apache.org/viewvc/directory/studio/trunk/org.apache.mina.core/pom.xml?rev=984799&r1=984798&r2=984799&view=diff
==============================================================================
--- directory/studio/trunk/org.apache.mina.core/pom.xml (original)
+++ directory/studio/trunk/org.apache.mina.core/pom.xml Thu Aug 12 14:22:27 2010
@@ -40,15 +40,32 @@
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-eclipse-plugin</artifactId>
         <configuration>
-          <skip>true</skip>
+          <skip>false</skip>
+          <pde>true</pde>
+          <additionalProjectnatures>
+            <projectnature>org.eclipse.pde.PluginNature</projectnature>
+            <projectnature>org.eclipse.jdt.core.javanature</projectnature>
+          </additionalProjectnatures>
+          <classpathContainers>
+            <classpathContainer>org.eclipse.jdt.launching.JRE_CONTAINER</classpathContainer>
+            <classpathContainer>org.eclipse.pde.core.requiredPlugins</classpathContainer>
+          </classpathContainers>
         </configuration>
       </plugin>
       <plugin>
         <groupId>org.apache.directory.studio</groupId>
         <artifactId>studio-maven-plugin</artifactId>
         <configuration>
-          <skip>true</skip>
+          <skip>false</skip>
+          <createManifest>true</createManifest>
         </configuration>
+        <executions>
+          <execution>
+            <goals>
+              <goal>prepare-jar-package</goal>
+            </goals>
+          </execution>
+        </executions>
       </plugin>
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
@@ -67,11 +84,16 @@
         <extensions>true</extensions>
         <configuration>
           <manifestLocation>META-INF</manifestLocation>
-          <instructions>            
+          <instructions>
             <Bundle-SymbolicName>${artifactId}</Bundle-SymbolicName>
+            <Require-Bundle>org.apache.logging.log4j;bundle-version="${org.apache.logging.log4j.version}",
+ org.slf4j.api;bundle-version="${org.slf4j.version}",
+ org.slf4j.log4j12;bundle-version="${org.slf4j.version}"</Require-Bundle>
+            <Embed-Dependency>*;scope=compile|runtime</Embed-Dependency>
+            <Embed-Directory>lib</Embed-Directory>
+            <Embed-StripGroup>true</Embed-StripGroup>
             <Export-Package>*</Export-Package>
             <Import-Package>!</Import-Package>
-            <Private-Package>!</Private-Package>
           </instructions>
         </configuration>
         <executions>
@@ -84,31 +106,6 @@
           </execution>
         </executions>
       </plugin>
-      
-      <!-- Unpack the jar -->
-      <plugin>
-        <artifactId>maven-dependency-plugin</artifactId>
-        <executions>
-          <execution>
-            <id>unpack-apache-directory-studio-plugin</id>
-            <phase>generate-resources</phase>
-            <goals>
-              <goal>unpack</goal>
-            </goals>
-            <configuration>
-              <overWrite>true</overWrite>
-              <outputDirectory>src/main/resources</outputDirectory>
-              <artifactItems>
-                <artifactItem>
-                  <groupId>org.apache.mina</groupId>
-                  <artifactId>mina-core</artifactId>
-                  <excludes>META-INF/**</excludes>
-                </artifactItem>
-              </artifactItems>
-            </configuration>
-          </execution>
-        </executions>
-      </plugin>
       <!-- No tests to run -->
       <plugin>
         <artifactId>maven-surefire-plugin</artifactId>
@@ -119,4 +116,17 @@
     </plugins>
   </build>
   
+  <dependencies>
+    <dependency>
+      <groupId>org.apache.mina</groupId>
+      <artifactId>mina-core</artifactId>
+      <exclusions>
+        <exclusion>
+          <groupId>org.slf4j</groupId>
+          <artifactId>slf4j-api</artifactId>
+        </exclusion>
+      </exclusions>
+    </dependency>
+  </dependencies>
+  
 </project>

Propchange: directory/studio/trunk/org.bouncycastle.bcprovjdk15/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Thu Aug 12 14:22:27 2010
@@ -1,3 +1,6 @@
+.classpath
+.project
+.settings
+lib
 META-INF
-src
 target

Modified: directory/studio/trunk/org.bouncycastle.bcprovjdk15/pom.xml
URL: http://svn.apache.org/viewvc/directory/studio/trunk/org.bouncycastle.bcprovjdk15/pom.xml?rev=984799&r1=984798&r2=984799&view=diff
==============================================================================
--- directory/studio/trunk/org.bouncycastle.bcprovjdk15/pom.xml (original)
+++ directory/studio/trunk/org.bouncycastle.bcprovjdk15/pom.xml Thu Aug 12 14:22:27 2010
@@ -40,15 +40,32 @@
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-eclipse-plugin</artifactId>
         <configuration>
-          <skip>true</skip>
+          <skip>false</skip>
+          <pde>true</pde>
+          <additionalProjectnatures>
+            <projectnature>org.eclipse.pde.PluginNature</projectnature>
+            <projectnature>org.eclipse.jdt.core.javanature</projectnature>
+          </additionalProjectnatures>
+          <classpathContainers>
+            <classpathContainer>org.eclipse.jdt.launching.JRE_CONTAINER</classpathContainer>
+            <classpathContainer>org.eclipse.pde.core.requiredPlugins</classpathContainer>
+          </classpathContainers>
         </configuration>
       </plugin>
       <plugin>
         <groupId>org.apache.directory.studio</groupId>
         <artifactId>studio-maven-plugin</artifactId>
         <configuration>
-          <skip>true</skip>
+          <skip>false</skip>
+          <createManifest>true</createManifest>
         </configuration>
+        <executions>
+          <execution>
+            <goals>
+              <goal>prepare-jar-package</goal>
+            </goals>
+          </execution>
+        </executions>
       </plugin>
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
@@ -67,11 +84,13 @@
         <extensions>true</extensions>
         <configuration>
           <manifestLocation>META-INF</manifestLocation>
-          <instructions>            
+          <instructions>
             <Bundle-SymbolicName>${artifactId}</Bundle-SymbolicName>
+            <Embed-Dependency>*;scope=compile|runtime</Embed-Dependency>
+            <Embed-Directory>lib</Embed-Directory>
+            <Embed-StripGroup>true</Embed-StripGroup>
             <Export-Package>*</Export-Package>
             <Import-Package>!</Import-Package>
-            <Private-Package>!</Private-Package>
           </instructions>
         </configuration>
         <executions>
@@ -84,31 +103,6 @@
           </execution>
         </executions>
       </plugin>
-      
-      <!-- Unpack the jar -->
-      <plugin>
-        <artifactId>maven-dependency-plugin</artifactId>
-        <executions>
-          <execution>
-            <id>unpack-apache-directory-studio-plugin</id>
-            <phase>generate-resources</phase>
-            <goals>
-              <goal>unpack</goal>
-            </goals>
-            <configuration>
-              <overWrite>true</overWrite>
-              <outputDirectory>src/main/resources</outputDirectory>
-              <artifactItems>
-                <artifactItem>
-                  <groupId>bouncycastle</groupId>
-                  <artifactId>bcprov-jdk15</artifactId>
-                  <excludes>META-INF/**</excludes>
-                </artifactItem>
-              </artifactItems>
-            </configuration>
-          </execution>
-        </executions>
-      </plugin>
       <!-- No tests to run -->
       <plugin>
         <artifactId>maven-surefire-plugin</artifactId>
@@ -119,4 +113,11 @@
     </plugins>
   </build>
   
+  <dependencies>
+    <dependency>
+      <groupId>bouncycastle</groupId>
+      <artifactId>bcprov-jdk15</artifactId>
+    </dependency>
+  </dependencies>
+  
 </project>

Propchange: directory/studio/trunk/org.dom4j.dom4j/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Thu Aug 12 14:22:27 2010
@@ -1,3 +1,6 @@
+.classpath
+.project
+.settings
+lib
 META-INF
-src
 target

Modified: directory/studio/trunk/org.dom4j.dom4j/pom.xml
URL: http://svn.apache.org/viewvc/directory/studio/trunk/org.dom4j.dom4j/pom.xml?rev=984799&r1=984798&r2=984799&view=diff
==============================================================================
--- directory/studio/trunk/org.dom4j.dom4j/pom.xml (original)
+++ directory/studio/trunk/org.dom4j.dom4j/pom.xml Thu Aug 12 14:22:27 2010
@@ -40,15 +40,32 @@
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-eclipse-plugin</artifactId>
         <configuration>
-          <skip>true</skip>
+          <skip>false</skip>
+          <pde>true</pde>
+          <additionalProjectnatures>
+            <projectnature>org.eclipse.pde.PluginNature</projectnature>
+            <projectnature>org.eclipse.jdt.core.javanature</projectnature>
+          </additionalProjectnatures>
+          <classpathContainers>
+            <classpathContainer>org.eclipse.jdt.launching.JRE_CONTAINER</classpathContainer>
+            <classpathContainer>org.eclipse.pde.core.requiredPlugins</classpathContainer>
+          </classpathContainers>
         </configuration>
       </plugin>
       <plugin>
         <groupId>org.apache.directory.studio</groupId>
         <artifactId>studio-maven-plugin</artifactId>
         <configuration>
-          <skip>true</skip>
+          <skip>false</skip>
+          <createManifest>true</createManifest>
         </configuration>
+        <executions>
+          <execution>
+            <goals>
+              <goal>prepare-jar-package</goal>
+            </goals>
+          </execution>
+        </executions>
       </plugin>
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
@@ -67,11 +84,13 @@
         <extensions>true</extensions>
         <configuration>
           <manifestLocation>META-INF</manifestLocation>
-          <instructions>            
+          <instructions>
             <Bundle-SymbolicName>${artifactId}</Bundle-SymbolicName>
+            <Embed-Dependency>*;scope=compile|runtime</Embed-Dependency>
+            <Embed-Directory>lib</Embed-Directory>
+            <Embed-StripGroup>true</Embed-StripGroup>
             <Export-Package>*</Export-Package>
             <Import-Package>!</Import-Package>
-            <Private-Package>!</Private-Package>
           </instructions>
         </configuration>
         <executions>
@@ -84,31 +103,6 @@
           </execution>
         </executions>
       </plugin>
-      
-      <!-- Unpack the jar -->
-      <plugin>
-        <artifactId>maven-dependency-plugin</artifactId>
-        <executions>
-          <execution>
-            <id>unpack-apache-directory-studio-plugin</id>
-            <phase>generate-resources</phase>
-            <goals>
-              <goal>unpack</goal>
-            </goals>
-            <configuration>
-              <overWrite>true</overWrite>
-              <outputDirectory>src/main/resources</outputDirectory>
-              <artifactItems>
-                <artifactItem>
-                  <groupId>dom4j</groupId>
-                  <artifactId>dom4j</artifactId>
-                  <excludes>META-INF/**</excludes>
-                </artifactItem>
-              </artifactItems>
-            </configuration>
-          </execution>
-        </executions>
-      </plugin>
       <!-- No tests to run -->
       <plugin>
         <artifactId>maven-surefire-plugin</artifactId>
@@ -119,4 +113,17 @@
     </plugins>
   </build>
   
+  <dependencies>
+    <dependency>
+      <groupId>dom4j</groupId>
+      <artifactId>dom4j</artifactId>
+      <exclusions>
+        <exclusion>
+          <groupId>xml-apis</groupId>
+          <artifactId>xml-apis</artifactId>
+        </exclusion>
+      </exclusions>
+    </dependency>
+  </dependencies>
+  
 </project>

Propchange: directory/studio/trunk/org.slf4j.api/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Thu Aug 12 14:22:27 2010
@@ -1,3 +1,6 @@
+.classpath
+.project
+.settings
+lib
 META-INF
-src
 target

Modified: directory/studio/trunk/org.slf4j.api/pom.xml
URL: http://svn.apache.org/viewvc/directory/studio/trunk/org.slf4j.api/pom.xml?rev=984799&r1=984798&r2=984799&view=diff
==============================================================================
--- directory/studio/trunk/org.slf4j.api/pom.xml (original)
+++ directory/studio/trunk/org.slf4j.api/pom.xml Thu Aug 12 14:22:27 2010
@@ -40,15 +40,32 @@
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-eclipse-plugin</artifactId>
         <configuration>
-          <skip>true</skip>
+          <skip>false</skip>
+          <pde>true</pde>
+          <additionalProjectnatures>
+            <projectnature>org.eclipse.pde.PluginNature</projectnature>
+            <projectnature>org.eclipse.jdt.core.javanature</projectnature>
+          </additionalProjectnatures>
+          <classpathContainers>
+            <classpathContainer>org.eclipse.jdt.launching.JRE_CONTAINER</classpathContainer>
+            <classpathContainer>org.eclipse.pde.core.requiredPlugins</classpathContainer>
+          </classpathContainers>
         </configuration>
       </plugin>
       <plugin>
         <groupId>org.apache.directory.studio</groupId>
         <artifactId>studio-maven-plugin</artifactId>
         <configuration>
-          <skip>true</skip>
+          <skip>false</skip>
+          <createManifest>true</createManifest>
         </configuration>
+        <executions>
+          <execution>
+            <goals>
+              <goal>prepare-jar-package</goal>
+            </goals>
+          </execution>
+        </executions>
       </plugin>
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
@@ -67,11 +84,13 @@
         <extensions>true</extensions>
         <configuration>
           <manifestLocation>META-INF</manifestLocation>
-          <instructions>            
+          <instructions>
             <Bundle-SymbolicName>${artifactId}</Bundle-SymbolicName>
+            <Embed-Dependency>*;scope=compile|runtime</Embed-Dependency>
+            <Embed-Directory>lib</Embed-Directory>
+            <Embed-StripGroup>true</Embed-StripGroup>
             <Export-Package>*</Export-Package>
             <Import-Package>!</Import-Package>
-            <Private-Package>!</Private-Package>
           </instructions>
         </configuration>
         <executions>
@@ -84,31 +103,6 @@
           </execution>
         </executions>
       </plugin>
-      
-      <!-- Unpack the jar -->
-      <plugin>
-        <artifactId>maven-dependency-plugin</artifactId>
-        <executions>
-          <execution>
-            <id>unpack-apache-directory-studio-plugin</id>
-            <phase>generate-resources</phase>
-            <goals>
-              <goal>unpack</goal>
-            </goals>
-            <configuration>
-              <overWrite>true</overWrite>
-              <outputDirectory>src/main/resources</outputDirectory>
-              <artifactItems>
-                <artifactItem>
-                  <groupId>org.slf4j</groupId>
-                  <artifactId>slf4j-api</artifactId>
-                  <excludes>META-INF/**</excludes>
-                </artifactItem>
-              </artifactItems>
-            </configuration>
-          </execution>
-        </executions>
-      </plugin>
       <!-- No tests to run -->
       <plugin>
         <artifactId>maven-surefire-plugin</artifactId>
@@ -119,4 +113,11 @@
     </plugins>
   </build>
   
+  <dependencies>
+    <dependency>
+      <groupId>org.slf4j</groupId>
+      <artifactId>slf4j-api</artifactId>
+    </dependency>
+  </dependencies>
+  
 </project>

Propchange: directory/studio/trunk/org.slf4j.log4j12/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Thu Aug 12 14:22:27 2010
@@ -1,3 +1,6 @@
+.classpath
+.project
+.settings
+lib
 META-INF
-src
 target

Modified: directory/studio/trunk/org.slf4j.log4j12/pom.xml
URL: http://svn.apache.org/viewvc/directory/studio/trunk/org.slf4j.log4j12/pom.xml?rev=984799&r1=984798&r2=984799&view=diff
==============================================================================
--- directory/studio/trunk/org.slf4j.log4j12/pom.xml (original)
+++ directory/studio/trunk/org.slf4j.log4j12/pom.xml Thu Aug 12 14:22:27 2010
@@ -40,15 +40,32 @@
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-eclipse-plugin</artifactId>
         <configuration>
-          <skip>true</skip>
+          <skip>false</skip>
+          <pde>true</pde>
+          <additionalProjectnatures>
+            <projectnature>org.eclipse.pde.PluginNature</projectnature>
+            <projectnature>org.eclipse.jdt.core.javanature</projectnature>
+          </additionalProjectnatures>
+          <classpathContainers>
+            <classpathContainer>org.eclipse.jdt.launching.JRE_CONTAINER</classpathContainer>
+            <classpathContainer>org.eclipse.pde.core.requiredPlugins</classpathContainer>
+          </classpathContainers>
         </configuration>
       </plugin>
       <plugin>
         <groupId>org.apache.directory.studio</groupId>
         <artifactId>studio-maven-plugin</artifactId>
         <configuration>
-          <skip>true</skip>
+          <skip>false</skip>
+          <createManifest>true</createManifest>
         </configuration>
+        <executions>
+          <execution>
+            <goals>
+              <goal>prepare-jar-package</goal>
+            </goals>
+          </execution>
+        </executions>
       </plugin>
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
@@ -67,13 +84,15 @@
         <extensions>true</extensions>
         <configuration>
           <manifestLocation>META-INF</manifestLocation>
-          <instructions>            
+          <instructions>
             <Bundle-SymbolicName>${artifactId}</Bundle-SymbolicName>
             <Require-Bundle>org.apache.logging.log4j;bundle-version="${org.apache.logging.log4j.version}",
  org.slf4j.api;bundle-version="${org.slf4j.version}"</Require-Bundle>
+            <Embed-Dependency>*;scope=compile|runtime</Embed-Dependency>
+            <Embed-Directory>lib</Embed-Directory>
+            <Embed-StripGroup>true</Embed-StripGroup>
             <Export-Package>*</Export-Package>
             <Import-Package>!</Import-Package>
-            <Private-Package>!</Private-Package>
           </instructions>
         </configuration>
         <executions>
@@ -86,31 +105,6 @@
           </execution>
         </executions>
       </plugin>
-      
-      <!-- Unpack the jar -->
-      <plugin>
-        <artifactId>maven-dependency-plugin</artifactId>
-        <executions>
-          <execution>
-            <id>unpack-apache-directory-studio-plugin</id>
-            <phase>generate-resources</phase>
-            <goals>
-              <goal>unpack</goal>
-            </goals>
-            <configuration>
-              <overWrite>true</overWrite>
-              <outputDirectory>src/main/resources</outputDirectory>
-              <artifactItems>
-                <artifactItem>
-                  <groupId>org.slf4j</groupId>
-                  <artifactId>slf4j-log4j12</artifactId>
-                  <excludes>META-INF/**</excludes>
-                </artifactItem>
-              </artifactItems>
-            </configuration>
-          </execution>
-        </executions>
-      </plugin>
       <!-- No tests to run -->
       <plugin>
         <artifactId>maven-surefire-plugin</artifactId>
@@ -123,12 +117,18 @@
   
   <dependencies>
     <dependency>
-      <groupId>org.apache.directory.studio</groupId>
-      <artifactId>org.apache.logging.log4j</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.directory.studio</groupId>
-      <artifactId>org.slf4j.api</artifactId>
+      <groupId>org.slf4j</groupId>
+      <artifactId>slf4j-log4j12</artifactId>
+      <exclusions>
+        <exclusion>
+          <groupId>log4j</groupId>
+          <artifactId>log4j</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>org.slf4j</groupId>
+          <artifactId>slf4j-api</artifactId>
+        </exclusion>
+      </exclusions>
     </dependency>
   </dependencies>
   

Propchange: directory/studio/trunk/org.xpp3.xpp3/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Thu Aug 12 14:22:27 2010
@@ -1,3 +1,6 @@
+.classpath
+.project
+.settings
+lib
 META-INF
-src
 target



Mime
View raw message