directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From pamarce...@apache.org
Subject svn commit: r984799 [2/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
Modified: directory/studio/trunk/org.xpp3.xpp3/pom.xml
URL: http://svn.apache.org/viewvc/directory/studio/trunk/org.xpp3.xpp3/pom.xml?rev=984799&r1=984798&r2=984799&view=diff
==============================================================================
--- directory/studio/trunk/org.xpp3.xpp3/pom.xml (original)
+++ directory/studio/trunk/org.xpp3.xpp3/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>xpp3</groupId>
-                  <artifactId>xpp3</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>xpp3</groupId>
+      <artifactId>xpp3</artifactId>
+    </dependency>
+  </dependencies>
+  
 </project>

Modified: directory/studio/trunk/schemaeditor/pom.xml
URL: http://svn.apache.org/viewvc/directory/studio/trunk/schemaeditor/pom.xml?rev=984799&r1=984798&r2=984799&view=diff
==============================================================================
--- directory/studio/trunk/schemaeditor/pom.xml (original)
+++ directory/studio/trunk/schemaeditor/pom.xml Thu Aug 12 14:22:27 2010
@@ -133,7 +133,7 @@
             <Embed-Dependency>*;scope=compile|runtime</Embed-Dependency>
             <Embed-Directory>lib</Embed-Directory>
             <Embed-StripGroup>true</Embed-StripGroup>
-            <Embed-Transitive>true</Embed-Transitive>  
+            <Embed-Transitive>true</Embed-Transitive>
             <Export-Package>org.apache.directory.studio.schemaeditor.model.*, org.apache.directory.studio.schemaeditor.model.io.*</Export-Package>
             <Import-Package>!</Import-Package>
             <Private-Package>!</Private-Package>



Mime
View raw message