openjpa-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mik...@apache.org
Subject svn commit: r1516357 - in /openjpa/trunk/openjpa-project: assembly.xml bin-assembly.xml pom.xml
Date Thu, 22 Aug 2013 01:50:27 GMT
Author: mikedd
Date: Thu Aug 22 01:50:27 2013
New Revision: 1516357

URL: http://svn.apache.org/r1516357
Log:
OPENJPA-1459: Add new archive that doesn't include sources or javadocs

Added:
    openjpa/trunk/openjpa-project/bin-assembly.xml
      - copied, changed from r1514833, openjpa/trunk/openjpa-project/assembly.xml
Modified:
    openjpa/trunk/openjpa-project/assembly.xml
    openjpa/trunk/openjpa-project/pom.xml

Modified: openjpa/trunk/openjpa-project/assembly.xml
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-project/assembly.xml?rev=1516357&r1=1516356&r2=1516357&view=diff
==============================================================================
--- openjpa/trunk/openjpa-project/assembly.xml (original)
+++ openjpa/trunk/openjpa-project/assembly.xml Thu Aug 22 01:50:27 2013
@@ -18,7 +18,7 @@
  under the License.   
 -->
 <assembly>
-    <id>binary</id>
+    <id>all</id>
     <formats>
         <format>zip</format>
     </formats>
@@ -67,13 +67,13 @@
             <outputDirectory>docs/javadoc</outputDirectory>
         </fileSet>
         <fileSet>
-        	<directory>../openjpa-persistence/target/classes/org/apache/openjpa/persistence</directory>
-        	<outputDirectory>docs/schema</outputDirectory>
-        	<includes>
-        		<include>extendable-orm.xsd</include>
-        		<include>openjpa-orm.xsd</include>
-        	</includes>
-        </fileSet>        
+            <directory>../openjpa-persistence/target/classes/org/apache/openjpa/persistence</directory>
+            <outputDirectory>docs/schema</outputDirectory>
+            <includes>
+                <include>extendable-orm.xsd</include>
+                <include>openjpa-orm.xsd</include>
+            </includes>
+        </fileSet>
         <fileSet>
             <directory>../openjpa-examples/image-gallery</directory>
             <outputDirectory>examples/image-gallery</outputDirectory>

Copied: openjpa/trunk/openjpa-project/bin-assembly.xml (from r1514833, openjpa/trunk/openjpa-project/assembly.xml)
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-project/bin-assembly.xml?p2=openjpa/trunk/openjpa-project/bin-assembly.xml&p1=openjpa/trunk/openjpa-project/assembly.xml&r1=1514833&r2=1516357&rev=1516357&view=diff
==============================================================================
--- openjpa/trunk/openjpa-project/assembly.xml (original)
+++ openjpa/trunk/openjpa-project/bin-assembly.xml Thu Aug 22 01:50:27 2013
@@ -18,7 +18,7 @@
  under the License.   
 -->
 <assembly>
-    <id>binary</id>
+    <id>binaries</id>
     <formats>
         <format>zip</format>
     </formats>
@@ -45,27 +45,6 @@
                 <include>CHANGES.txt</include>
             </includes>
         </fileSet>
-        <!--
-        <fileSet>
-            <directory>licenses</directory>
-            <outputDirectory>/lib</outputDirectory>
-            <includes>
-                <include>*</include>
-            </includes>
-        </fileSet>
-        <fileSet>
-            <directory>target/examples</directory>
-            <outputDirectory>/examples</outputDirectory>
-        </fileSet>
-        -->
-        <fileSet>
-            <directory>target/docbook</directory>
-            <outputDirectory>docs/docbook</outputDirectory>
-        </fileSet>
-        <fileSet>
-            <directory>../target/site/apidocs</directory>
-            <outputDirectory>docs/javadoc</outputDirectory>
-        </fileSet>
         <fileSet>
         	<directory>../openjpa-persistence/target/classes/org/apache/openjpa/persistence</directory>
         	<outputDirectory>docs/schema</outputDirectory>
@@ -74,46 +53,6 @@
         		<include>openjpa-orm.xsd</include>
         	</includes>
         </fileSet>        
-        <fileSet>
-            <directory>../openjpa-examples/image-gallery</directory>
-            <outputDirectory>examples/image-gallery</outputDirectory>
-            <excludes>
-                <exclude>**/target/**</exclude>
-                <exclude>**/*.log</exclude>
-                <exclude>**/.*</exclude>
-                <exclude>**/.*/**</exclude>
-            </excludes>
-        </fileSet>
-        <fileSet>
-            <directory>../openjpa-examples/openbooks</directory>
-            <outputDirectory>examples/openbooks</outputDirectory>
-            <excludes>
-                <exclude>**/target/**</exclude>
-                <exclude>**/*.log</exclude>
-                <exclude>**/.*</exclude>
-                <exclude>**/.*/**</exclude>
-            </excludes>
-        </fileSet>
-        <fileSet>
-            <directory>../openjpa-examples/opentrader</directory>
-            <outputDirectory>examples/opentrader</outputDirectory>
-            <excludes>
-                <exclude>**/target/**</exclude>
-                <exclude>**/*.log</exclude>
-                <exclude>**/.*</exclude>
-                <exclude>**/.*/**</exclude>
-            </excludes>
-        </fileSet>
-        <fileSet>
-            <directory>../openjpa-examples/simple/src/main/java</directory>
-            <outputDirectory>examples/simple</outputDirectory>
-            <excludes>
-                <exclude>**/target/**</exclude>
-                <exclude>**/*.log</exclude>
-                <exclude>**/.*</exclude>
-                <exclude>**/.*/**</exclude>
-            </excludes>
-        </fileSet>
     </fileSets>
     <dependencySets>
         <dependencySet>

Modified: openjpa/trunk/openjpa-project/pom.xml
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-project/pom.xml?rev=1516357&r1=1516356&r2=1516357&view=diff
==============================================================================
--- openjpa/trunk/openjpa-project/pom.xml (original)
+++ openjpa/trunk/openjpa-project/pom.xml Thu Aug 22 01:50:27 2013
@@ -144,23 +144,25 @@
                         <configuration>
                             <descriptors>
                                 <descriptor>assembly.xml</descriptor>
+                                <descriptor>source-assembly.xml</descriptor>
+                                <descriptor>bin-assembly.xml</descriptor>
                             </descriptors>
                             <outputDirectory>${openjpa.assembly.outputDirectory}</outputDirectory>
                             <workDirectory>target/work</workDirectory>
                         </configuration>
                     </execution>
-                    <execution>
-                        <id>sources</id>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>attached</goal>
-                        </goals>
-                        <configuration>
-                            <descriptor>source-assembly.xml</descriptor>
-                            <outputDirectory>${openjpa.assembly.outputDirectory}</outputDirectory>
-                            <workDirectory>target/work</workDirectory>
-                        </configuration>
-                    </execution>
+                    <!--<execution>-->
+                        <!--<id>sources</id>-->
+                        <!--<phase>package</phase>-->
+                        <!--<goals>-->
+                            <!--<goal>attached</goal>-->
+                        <!--</goals>-->
+                        <!--<configuration>-->
+                            <!--<descriptor>source-assembly.xml</descriptor>-->
+                            <!--<outputDirectory>${openjpa.assembly.outputDirectory}</outputDirectory>-->
+                            <!--<workDirectory>target/work</workDirectory>-->
+                        <!--</configuration>-->
+                    <!--</execution>-->
                 </executions>
             </plugin>
 



Mime
View raw message