You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commons-dev@ws.apache.org by jo...@apache.org on 2006/08/13 03:51:36 UTC
svn commit: r431132 - in /webservices/commons/trunk/modules/XmlSchema:
assembly-bin.xml assembly-src.xml pom.xml site/ src/main/assembly/
src/main/assembly/bin.xml src/main/assembly/src.xml src/site/
Author: jochen
Date: Sat Aug 12 18:51:35 2006
New Revision: 431132
URL: http://svn.apache.org/viewvc?rev=431132&view=rev
Log:
Changed layout in order to match the layout of Axiom and Neethi.
Added:
webservices/commons/trunk/modules/XmlSchema/src/main/assembly/
webservices/commons/trunk/modules/XmlSchema/src/main/assembly/bin.xml
webservices/commons/trunk/modules/XmlSchema/src/main/assembly/src.xml
webservices/commons/trunk/modules/XmlSchema/src/site/
- copied from r431128, webservices/commons/trunk/modules/XmlSchema/site/
Removed:
webservices/commons/trunk/modules/XmlSchema/assembly-bin.xml
webservices/commons/trunk/modules/XmlSchema/assembly-src.xml
webservices/commons/trunk/modules/XmlSchema/site/
Modified:
webservices/commons/trunk/modules/XmlSchema/pom.xml
Modified: webservices/commons/trunk/modules/XmlSchema/pom.xml
URL: http://svn.apache.org/viewvc/webservices/commons/trunk/modules/XmlSchema/pom.xml?rev=431132&r1=431131&r2=431132&view=diff
==============================================================================
--- webservices/commons/trunk/modules/XmlSchema/pom.xml (original)
+++ webservices/commons/trunk/modules/XmlSchema/pom.xml Sat Aug 12 18:51:35 2006
@@ -175,39 +175,12 @@
<url>http://www.apache.org/</url>
</organization>
<build>
- <resources>
- <resource>
- <directory>src</directory>
- <includes>
- <include>**/*.xml</include>
- </includes>
- <excludes>
- <exclude>**/package.html</exclude>
- </excludes>
- </resource>
- <resource>
- <targetPath>META-INF</targetPath>
- <directory>${basedir}</directory>
- <includes>
- <include>LICENSE*</include>
- <include>NOTICE.txt</include>
- </includes>
- </resource>
- </resources>
- <testResources>
- <testResource>
- <directory>test-resources</directory>
- <includes>
- <include>**/*.xml</include>
- <include>**/*.xsd</include>
- </includes>
- </testResource>
- </testResources>
<plugins>
<plugin>
<artifactId>maven-antrun-plugin</artifactId>
<executions>
<execution>
+ <id>prepareNistTest</id>
<phase>generate-test-resources</phase>
<goals>
<goal>run</goal>
@@ -221,16 +194,26 @@
</tasks>
</configuration>
</execution>
+ <execution>
+ <id>prepareLicenseFiles</id>
+ <phase>generate-resources</phase>
+ <configuration>
+ <tasks>
+ <copy todir="${project.build.outputDirectory}/META-INF">
+ <fileset dir="${basedir}">
+ <include name="LICENSE.txt"/>
+ <include name="NOTICE.txt"/>
+ </fileset>
+ </copy>
+ </tasks>
+ </configuration>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ </execution>
</executions>
</plugin>
<plugin>
- <artifactId>maven-site-plugin</artifactId>
- <configuration>
- <siteDirectory>${basedir}/site</siteDirectory>
- <resourcesDirectory>${basedir}/site/resources</resourcesDirectory>
- </configuration>
- </plugin>
- <plugin>
<artifactId>maven-one-plugin</artifactId>
<executions>
<execution>
@@ -276,6 +259,29 @@
</excludes>
</configuration>
</plugin>
+ <plugin>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <configuration>
+ <descriptors>
+ <descriptor>src/main/assembly/bin.xml</descriptor>
+ <descriptor>src/main/assembly/src.xml</descriptor>
+ </descriptors>
+ <tarLongFileMode>gnu</tarLongFileMode>
+ </configuration>
+ </plugin>
+ <plugin>
+ <artifactId>maven-source-plugin</artifactId>
+ <executions>
+ <execution>
+ <goals>
+ <goal>jar</goal>
+ </goals>
+ </execution>
+ </executions>
+ <configuration>
+ <attach>true</attach>
+ </configuration>
+ </plugin>
</plugins>
</build>
<profiles>
@@ -289,50 +295,6 @@
</activation>
<build>
<plugins>
- <plugin>
- <artifactId>maven-assembly-plugin</artifactId>
- <executions>
- <execution>
- <id>src-assembly</id>
- <phase>package</phase>
- <goals>
- <goal>assembly</goal>
- </goals>
- <configuration>
- <descriptor>assembly-src.xml</descriptor>
- <finalName>XmlSchema-${project.version}</finalName>
- <outputDirectory>target/src-package</outputDirectory>
- <workDirectory>target/assembly/work</workDirectory>
- </configuration>
- </execution>
- <execution>
- <id>bin-assembly</id>
- <phase>package</phase>
- <goals>
- <goal>assembly</goal>
- </goals>
- <configuration>
- <descriptor>assembly-bin.xml</descriptor>
- <finalName>XmlSchema-${project.version}</finalName>
- <outputDirectory>target/src-package</outputDirectory>
- <workDirectory>target/assembly/work</workDirectory>
- </configuration>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <artifactId>maven-source-plugin</artifactId>
- <executions>
- <execution>
- <goals>
- <goal>jar</goal>
- </goals>
- </execution>
- </executions>
- <configuration>
- <attach>true</attach>
- </configuration>
- </plugin>
<plugin>
<artifactId>maven-javadoc-plugin</artifactId>
<executions>
Added: webservices/commons/trunk/modules/XmlSchema/src/main/assembly/bin.xml
URL: http://svn.apache.org/viewvc/webservices/commons/trunk/modules/XmlSchema/src/main/assembly/bin.xml?rev=431132&view=auto
==============================================================================
--- webservices/commons/trunk/modules/XmlSchema/src/main/assembly/bin.xml (added)
+++ webservices/commons/trunk/modules/XmlSchema/src/main/assembly/bin.xml Sat Aug 12 18:51:35 2006
@@ -0,0 +1,21 @@
+<assembly>
+ <id>bin</id>
+ <formats>
+ <format>tar.gz</format>
+ </formats>
+ <includeSiteDirectory>true</includeSiteDirectory>
+ <fileSets>
+ <fileSet>
+ <includes>
+ <include>*.txt</include>
+ </includes>
+ </fileSet>
+ <fileSet>
+ <directory>target</directory>
+ <outputDirectory></outputDirectory>
+ <includes>
+ <include>*.jar</include>
+ </includes>
+ </fileSet>
+ </fileSets>
+</assembly>
Added: webservices/commons/trunk/modules/XmlSchema/src/main/assembly/src.xml
URL: http://svn.apache.org/viewvc/webservices/commons/trunk/modules/XmlSchema/src/main/assembly/src.xml?rev=431132&view=auto
==============================================================================
--- webservices/commons/trunk/modules/XmlSchema/src/main/assembly/src.xml (added)
+++ webservices/commons/trunk/modules/XmlSchema/src/main/assembly/src.xml Sat Aug 12 18:51:35 2006
@@ -0,0 +1,26 @@
+<assembly>
+ <id>src</id>
+ <formats>
+ <format>tar.gz</format>
+ </formats>
+ <fileSets>
+ <fileSet>
+ <includes>
+ <include>*.txt</include>
+ <include>*.xml</include>
+ <include>*.properties</include>
+ <include>.classpath</include>
+ <include>.project</include>
+ </includes>
+ </fileSet>
+ <fileSet>
+ <directory>.settings</directory>
+ </fileSet>
+ <fileSet>
+ <directory>src</directory>
+ </fileSet>
+ <fileSet>
+ <directory>test-resources</directory>
+ </fileSet>
+ </fileSets>
+</assembly>
\ No newline at end of file
---------------------------------------------------------------------
To unsubscribe, e-mail: commons-dev-unsubscribe@ws.apache.org
For additional commands, e-mail: commons-dev-help@ws.apache.org