Menu
▾
▴
[Maven-plugins-cvs] cvs commit: maven-plugins maven.xml
|
From: Andy J. <and...@us...> - 2004-05-19 16:30:07
|
andy_jefferson 04/05/19 09:30:00
Modified: jpox/xdocs changes.xml index.xml properties.xml
jpox plugin.jelly project.xml
. maven.xml
Log:
Updated to use JPOX Enhancer instead of Sun Reference Implementation
Revision Changes Path
1.9 +1 -0 maven-plugins/jpox/xdocs/changes.xml
Index: changes.xml
===================================================================
RCS file: /cvsroot/maven-plugins/maven-plugins/jpox/xdocs/changes.xml,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- changes.xml 9 May 2004 07:30:10 -0000 1.8
+++ changes.xml 19 May 2004 16:29:57 -0000 1.9
@@ -8,6 +8,7 @@
<body>
<release version="1.0.0-beta-4" date="27-Apr-2004" description="Use of JPOX 1.0.0-beta-4">
<action dev="andy_jefferson" type="update">Changed to use JPOX 1.0.0-beta-4</action>
+ <action dev="andy_jefferson" type="update">Changed to use JPOX Enhancer 1.0.0-beta-4 instead of Sun RI enhancer</action>
<action dev="andy_jefferson" type="add">Addition of verbose option to get diagnostics</action>
</release>
1.5 +4 -4 maven-plugins/jpox/xdocs/index.xml
Index: index.xml
===================================================================
RCS file: /cvsroot/maven-plugins/maven-plugins/jpox/xdocs/index.xml,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- index.xml 26 Mar 2004 09:33:39 -0000 1.4
+++ index.xml 19 May 2004 16:29:57 -0000 1.5
@@ -9,9 +9,8 @@
<section name="Maven JPOX Plugin">
<p>
This plugin provides an interface to the Java Persistent Objects
- JDO implementation (
- <a href="http://jpox.sourceforge.net">JPOX</a>
- ) of Sun's JDO spec.
+ JDO implementation (<a href="http://www.jpox.org">JPOX</a>)
+ of Sun's JDO spec.
</p>
<p>
To use this plugin, you will need to install JPOX's jar into
@@ -20,7 +19,8 @@
your JPOX installation directory).
<source>
${maven.repo.local}/jpox/jars/
-${maven.repo.local}/jpox/jars/jpox-1.0.0-beta-3.jar
+${maven.repo.local}/jpox/jars/jpox-1.0.0-beta-4.jar
+${maven.repo.local}/jpox/jars/jpox-enhancer-1.0.0-beta-4.jar
</source>
</p>
</section>
1.3 +7 -0 maven-plugins/jpox/xdocs/properties.xml
Index: properties.xml
===================================================================
RCS file: /cvsroot/maven-plugins/maven-plugins/jpox/xdocs/properties.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- properties.xml 22 Jan 2004 19:48:45 -0000 1.2
+++ properties.xml 19 May 2004 16:29:57 -0000 1.3
@@ -69,6 +69,13 @@
Password for the database to be used by JPOX
</td>
</tr>
+ <tr>
+ <td>maven.jpox.log4j.configuration</td>
+ <td>Yes</td>
+ <td>
+ Log4J Configuration file for logging of output
+ </td>
+ </tr>
</table>
</section>
</body>
1.7 +20 -12 maven-plugins/jpox/plugin.jelly
Index: plugin.jelly
===================================================================
RCS file: /cvsroot/maven-plugins/maven-plugins/jpox/plugin.jelly,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- plugin.jelly 9 May 2004 07:30:11 -0000 1.6
+++ plugin.jelly 19 May 2004 16:29:58 -0000 1.7
@@ -45,9 +45,10 @@
<!-- Construct CLASSPATH to include JPOX and the classes -->
<path id="jpoxClasspath">
- <path refid="maven.dependency.classpath"/>
+ <!--path refid="maven.dependency.classpath"/-->
<pathelement path="${maven.jpox.classes.dir}"/>
<pathelement path="${plugin.getDependencyPath('jpox')}"/>
+ <pathelement path="${plugin.getDependencyPath('log4j')}"/>
</path>
</goal>
@@ -58,29 +59,36 @@
-->
<goal name="jpox:enhance"
prereqs="jpox:init">
- <echo>JDO-enhancing classes for Java Persistent Objects</echo>
+ <echo>JDO-enhancing classes for Java Persistent Objects JDO</echo>
- <!-- Construct path for source files -->
- <pathconvert pathsep=":" property="sourcepath" refid="jpoxClasspath"/>
+ <!-- Construct CLASSPATH for enhancer -->
+ <path id="enhancerClasspath">
+ <pathelement path="${maven.jpox.classes.dir}"/>
+ <pathelement path="${plugin.getDependencyPath('jpox:jpox-enhancer')}"/>
+ <pathelement path="${plugin.getDependencyPath('bcel')}"/>
+ <pathelement path="${plugin.getDependencyPath('log4j')}"/>
+ <pathelement path="${plugin.getDependencyPath('jdo')}"/>
+ </path>
- <!-- Run enhancer on JDO files -->
+ <!-- Run JPOX Enhancer on JDO files -->
<ant:java dir="${maven.jpox.classes.dir}"
- classname="org.jpox.enhance.SunReferenceEnhancer"
+ classname="org.jpox.enhancer.StandardGenerator"
failonerror="true"
fork="true">
- <classpath refid="jpoxClasspath"/>
+ <classpath refid="enhancerClasspath"/>
- <arg line="-s"/>
- <arg path="${sourcepath}"/>
+ <j:if test="${context.getVariable('maven.jpox.log4j.configuration') != null}">
+ <jvmarg value="-Dlog4j.configuration=${context.getVariable('maven.jpox.log4j.configuration')}"/>
+ </j:if>
- <j:if test="${context.getVariable('maven.jpox.verbose').toString().trim().equalsIgnoreCase('true')}">
+ <!--j:if test="${context.getVariable('maven.jpox.verbose').toString().trim().equalsIgnoreCase('true')}">
<arg line="-v"/>
- </j:if>
+ </j:if -->
<arg line="${jdoMetaDataFiles}"/>
</ant:java>
- <echo>Classes are now JDO-enhanced for Java Persistent Objects</echo>
+ <echo>Classes are now JDO-enhanced for Java Persistent Objects JDO</echo>
</goal>
<!--
1.12 +17 -2 maven-plugins/jpox/project.xml
Index: project.xml
===================================================================
RCS file: /cvsroot/maven-plugins/maven-plugins/jpox/project.xml,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- project.xml 9 May 2004 07:30:11 -0000 1.11
+++ project.xml 19 May 2004 16:29:58 -0000 1.12
@@ -28,17 +28,32 @@
<dependencies>
<!-- if any of the jpox dependencies are updated remember to update ../maven-xml -->
+ <!-- Runtime dependencies -->
<dependency>
<groupId>jpox</groupId>
<artifactId>jpox</artifactId>
<version>1.0.0-beta-4</version>
- <url>http://maven-plugins.sf.net/maven</url>
+ </dependency>
+ <dependency>
+ <groupId>jpox</groupId>
+ <artifactId>jpox-enhancer</artifactId>
+ <version>1.0.0-beta-4</version>
+ </dependency>
+ <dependency>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
+ <version>1.2.8</version>
</dependency>
<dependency>
<groupId>jdo</groupId>
- <artifactId>jdori</artifactId>
+ <artifactId>jdo</artifactId>
<version>1.0.1</version>
</dependency>
+ <dependency>
+ <groupId>bcel</groupId>
+ <artifactId>bcel</artifactId>
+ <version>5.1</version>
+ </dependency>
</dependencies>
</project>
1.18 +2 -1 maven-plugins/maven.xml
Index: maven.xml
===================================================================
RCS file: /cvsroot/maven-plugins/maven-plugins/maven.xml,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- maven.xml 9 May 2004 07:30:13 -0000 1.17
+++ maven.xml 19 May 2004 16:29:59 -0000 1.18
@@ -23,7 +23,8 @@
<!-- for the jpox plugin -->
<ant:mkdir dir="${maven.repo.local}/jpox/jars/"/>
<ant:touch file="${maven.repo.local}/jpox/jars/jpox-1.0.0-beta-4.jar"/>
- <ant:touch file="${maven.repo.local}/jdo/jars/jdori-1.0.1.jar"/>
+ <ant:touch file="${maven.repo.local}/jpox/jars/jpox-enhancer-1.0.0-beta-4.jar"/>
+ <ant:touch file="${maven.repo.local}/jdo/jars/jdo-1.0.1.jar"/>
<!-- for the jaxb plugin -->
<ant:mkdir dir="${maven.repo.local}/jaxb/jars/"/>
|
