You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by li...@apache.org on 2007/10/15 22:41:06 UTC
svn commit: r584907 - in /geronimo/devtools/j2g/trunk:
plugins/org.apache.geronimo.devtools.j2g.common/
plugins/org.apache.geronimo.devtools.j2g.descriptors/
plugins/org.apache.geronimo.devtools.j2g.jasper/
plugins/org.apache.geronimo.devtools.j2g.reso...
Author: linsun
Date: Mon Oct 15 13:41:05 2007
New Revision: 584907
URL: http://svn.apache.org/viewvc?rev=584907&view=rev
Log:
portions of G3309 - Add missing LICENSE.txt and NOTICE.txt files to the J2G conversion tool. Also removed junit from the util plugin.
Modified:
geronimo/devtools/j2g/trunk/plugins/org.apache.geronimo.devtools.j2g.common/pom.xml
geronimo/devtools/j2g/trunk/plugins/org.apache.geronimo.devtools.j2g.descriptors/pom.xml
geronimo/devtools/j2g/trunk/plugins/org.apache.geronimo.devtools.j2g.jasper/pom.xml
geronimo/devtools/j2g/trunk/plugins/org.apache.geronimo.devtools.j2g.resources/pom.xml
geronimo/devtools/j2g/trunk/plugins/org.apache.geronimo.devtools.j2g.sources/pom.xml
geronimo/devtools/j2g/trunk/plugins/org.apache.geronimo.devtools.j2g.ui/pom.xml
geronimo/devtools/j2g/trunk/plugins/org.apache.geronimo.devtools.j2g.util/pom.xml
geronimo/devtools/j2g/trunk/src/main/assembly/bin.xml
Modified: geronimo/devtools/j2g/trunk/plugins/org.apache.geronimo.devtools.j2g.common/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/devtools/j2g/trunk/plugins/org.apache.geronimo.devtools.j2g.common/pom.xml?rev=584907&r1=584906&r2=584907&view=diff
==============================================================================
--- geronimo/devtools/j2g/trunk/plugins/org.apache.geronimo.devtools.j2g.common/pom.xml (original)
+++ geronimo/devtools/j2g/trunk/plugins/org.apache.geronimo.devtools.j2g.common/pom.xml Mon Oct 15 13:41:05 2007
@@ -31,6 +31,16 @@
<name>${artifactId}</name>
<build>
+ <resources>
+ <resource>
+ <directory>.</directory>
+ <targetPath>META-INF</targetPath>
+ <includes>
+ <include>LICENSE.txt</include>
+ <include>NOTICE.txt</include>
+ </includes>
+ </resource>
+ </resources>
<plugins>
<plugin>
<artifactId>maven-dependency-plugin</artifactId>
Modified: geronimo/devtools/j2g/trunk/plugins/org.apache.geronimo.devtools.j2g.descriptors/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/devtools/j2g/trunk/plugins/org.apache.geronimo.devtools.j2g.descriptors/pom.xml?rev=584907&r1=584906&r2=584907&view=diff
==============================================================================
--- geronimo/devtools/j2g/trunk/plugins/org.apache.geronimo.devtools.j2g.descriptors/pom.xml (original)
+++ geronimo/devtools/j2g/trunk/plugins/org.apache.geronimo.devtools.j2g.descriptors/pom.xml Mon Oct 15 13:41:05 2007
@@ -30,28 +30,36 @@
<name>${artifactId}</name>
<build>
- <resources>
- <resource>
- <directory>../../src/main/resources/properties/org.apache.geronimo.devtools.j2g.descriptors.ejb</directory>
- <targetPath>.</targetPath>
- <includes>
- <include>persistence_differences.properties</include>
- </includes>
- </resource>
- <resource>
- <directory>../../src/main/resources/properties/org.apache.geronimo.devtools.j2g.descriptors.ejb.annotation</directory>
- <targetPath>.</targetPath>
- <includes>
- <include>annotation_differences.properties</include>
- </includes>
- </resource>
+ <resources>
+ <resource>
+ <directory>.</directory>
+ <targetPath>META-INF</targetPath>
+ <includes>
+ <include>LICENSE.txt</include>
+ <include>NOTICE.txt</include>
+ </includes>
+ </resource>
<resource>
<directory>.</directory>
<includes>
<include>plugin.xml</include>
</includes>
</resource>
- </resources>
+ <resource>
+ <directory>../../src/main/resources/properties/org.apache.geronimo.devtools.j2g.descriptors.ejb</directory>
+ <targetPath>.</targetPath>
+ <includes>
+ <include>persistence_differences.properties</include>
+ </includes>
+ </resource>
+ <resource>
+ <directory>../../src/main/resources/properties/org.apache.geronimo.devtools.j2g.descriptors.ejb.annotation</directory>
+ <targetPath>.</targetPath>
+ <includes>
+ <include>annotation_differences.properties</include>
+ </includes>
+ </resource>
+ </resources>
<plugins>
<plugin>
<groupId>org.apache.geronimo.devtools</groupId>
Modified: geronimo/devtools/j2g/trunk/plugins/org.apache.geronimo.devtools.j2g.jasper/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/devtools/j2g/trunk/plugins/org.apache.geronimo.devtools.j2g.jasper/pom.xml?rev=584907&r1=584906&r2=584907&view=diff
==============================================================================
--- geronimo/devtools/j2g/trunk/plugins/org.apache.geronimo.devtools.j2g.jasper/pom.xml (original)
+++ geronimo/devtools/j2g/trunk/plugins/org.apache.geronimo.devtools.j2g.jasper/pom.xml Mon Oct 15 13:41:05 2007
@@ -43,6 +43,14 @@
<include>*.jar</include>
</includes>
</resource>
+ <resource>
+ <directory>.</directory>
+ <targetPath>META-INF</targetPath>
+ <includes>
+ <include>LICENSE.txt</include>
+ <include>NOTICE.txt</include>
+ </includes>
+ </resource>
</resources>
<plugins>
<plugin>
Modified: geronimo/devtools/j2g/trunk/plugins/org.apache.geronimo.devtools.j2g.resources/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/devtools/j2g/trunk/plugins/org.apache.geronimo.devtools.j2g.resources/pom.xml?rev=584907&r1=584906&r2=584907&view=diff
==============================================================================
--- geronimo/devtools/j2g/trunk/plugins/org.apache.geronimo.devtools.j2g.resources/pom.xml (original)
+++ geronimo/devtools/j2g/trunk/plugins/org.apache.geronimo.devtools.j2g.resources/pom.xml Mon Oct 15 13:41:05 2007
@@ -30,6 +30,23 @@
<name>${artifactId}</name>
<build>
+ <resources>
+ <resource>
+ <directory>.</directory>
+ <targetPath>META-INF</targetPath>
+ <includes>
+ <include>LICENSE.txt</include>
+ <include>NOTICE.txt</include>
+ </includes>
+ </resource>
+ <resource>
+ <directory>.</directory>
+ <targetPath>.</targetPath>
+ <includes>
+ <include>plugin.xml</include>
+ </includes>
+ </resource>
+ </resources>
<plugins>
<plugin>
<artifactId>maven-dependency-plugin</artifactId>
Modified: geronimo/devtools/j2g/trunk/plugins/org.apache.geronimo.devtools.j2g.sources/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/devtools/j2g/trunk/plugins/org.apache.geronimo.devtools.j2g.sources/pom.xml?rev=584907&r1=584906&r2=584907&view=diff
==============================================================================
--- geronimo/devtools/j2g/trunk/plugins/org.apache.geronimo.devtools.j2g.sources/pom.xml (original)
+++ geronimo/devtools/j2g/trunk/plugins/org.apache.geronimo.devtools.j2g.sources/pom.xml Mon Oct 15 13:41:05 2007
@@ -44,6 +44,14 @@
</includes>
</resource>
<resource>
+ <directory>.</directory>
+ <targetPath>META-INF</targetPath>
+ <includes>
+ <include>LICENSE.txt</include>
+ <include>NOTICE.txt</include>
+ </includes>
+ </resource>
+ <resource>
<directory>../../src/main/resources/properties/org.apache.geronimo.devtools.j2g.sources.dependence</directory>
<targetPath>.</targetPath>
<includes>
Modified: geronimo/devtools/j2g/trunk/plugins/org.apache.geronimo.devtools.j2g.ui/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/devtools/j2g/trunk/plugins/org.apache.geronimo.devtools.j2g.ui/pom.xml?rev=584907&r1=584906&r2=584907&view=diff
==============================================================================
--- geronimo/devtools/j2g/trunk/plugins/org.apache.geronimo.devtools.j2g.ui/pom.xml (original)
+++ geronimo/devtools/j2g/trunk/plugins/org.apache.geronimo.devtools.j2g.ui/pom.xml Mon Oct 15 13:41:05 2007
@@ -45,6 +45,14 @@
<include>*.jar</include>
</includes>
</resource>
+ <resource>
+ <directory>.</directory>
+ <targetPath>META-INF</targetPath>
+ <includes>
+ <include>LICENSE.txt</include>
+ <include>NOTICE.txt</include>
+ </includes>
+ </resource>
</resources>
<plugins>
<plugin>
Modified: geronimo/devtools/j2g/trunk/plugins/org.apache.geronimo.devtools.j2g.util/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/devtools/j2g/trunk/plugins/org.apache.geronimo.devtools.j2g.util/pom.xml?rev=584907&r1=584906&r2=584907&view=diff
==============================================================================
--- geronimo/devtools/j2g/trunk/plugins/org.apache.geronimo.devtools.j2g.util/pom.xml (original)
+++ geronimo/devtools/j2g/trunk/plugins/org.apache.geronimo.devtools.j2g.util/pom.xml Mon Oct 15 13:41:05 2007
@@ -45,6 +45,14 @@
<include>*.jar</include>
</includes>
</resource>
+ <resource>
+ <directory>.</directory>
+ <targetPath>META-INF</targetPath>
+ <includes>
+ <include>LICENSE.txt</include>
+ <include>NOTICE.txt</include>
+ </includes>
+ </resource>
</resources>
<plugins>
<plugin>
@@ -71,10 +79,6 @@
<artifactId>jaxen</artifactId>
</artifactItem>
<artifactItem>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- </artifactItem>
- <artifactItem>
<groupId>pull-parser</groupId>
<artifactId>pull-parser</artifactId>
</artifactItem>
@@ -102,6 +106,7 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
+ <scope>test</scope>
</dependency>
<dependency>
<groupId>pull-parser</groupId>
Modified: geronimo/devtools/j2g/trunk/src/main/assembly/bin.xml
URL: http://svn.apache.org/viewvc/geronimo/devtools/j2g/trunk/src/main/assembly/bin.xml?rev=584907&r1=584906&r2=584907&view=diff
==============================================================================
--- geronimo/devtools/j2g/trunk/src/main/assembly/bin.xml (original)
+++ geronimo/devtools/j2g/trunk/src/main/assembly/bin.xml Mon Oct 15 13:41:05 2007
@@ -43,11 +43,11 @@
<directory>src/main/resources/compatibility</directory>
<outputDirectory>/compatibility</outputDirectory>
</fileSet>
- <fileSet>
+ <fileSet>
<directory>src/main/resources/properties</directory>
<outputDirectory>/properties</outputDirectory>
</fileSet>
- <fileSet>
+ <fileSet>
<directory>src/main/resources/bin</directory>
<outputDirectory>/bin</outputDirectory>
<fileMode>0755</fileMode>
@@ -57,4 +57,14 @@
<outputDirectory>/</outputDirectory>
</fileSet>
</fileSets>
+ <files>
+ <file>
+ <source>LICENSE.txt</source>
+ <outputDirectory>/</outputDirectory>
+ </file>
+ <file>
+ <source>NOTICE.txt</source>
+ <outputDirectory>/</outputDirectory>
+ </file>
+ </files>
</assembly>