You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by jg...@apache.org on 2005/08/13 18:17:34 UTC
svn commit: r232504 - in /geronimo/trunk: ./ modules/axis-builder/
modules/client-builder/ modules/connector-builder/ modules/j2ee-builder/
modules/j2ee-schema/ modules/naming-builder/ modules/security-builder/
modules/service-builder/ modules/web-buil...
Author: jgenender
Date: Sat Aug 13 09:17:23 2005
New Revision: 232504
URL: http://svn.apache.org/viewcvs?rev=232504&view=rev
Log:
Fixes eclipse project build with reference to xmlbeans
Modified:
geronimo/trunk/maven.xml
geronimo/trunk/modules/axis-builder/maven.xml
geronimo/trunk/modules/axis-builder/project.properties
geronimo/trunk/modules/client-builder/maven.xml
geronimo/trunk/modules/client-builder/project.properties
geronimo/trunk/modules/connector-builder/maven.xml
geronimo/trunk/modules/connector-builder/project.properties
geronimo/trunk/modules/j2ee-builder/maven.xml
geronimo/trunk/modules/j2ee-builder/project.properties
geronimo/trunk/modules/j2ee-schema/maven.xml
geronimo/trunk/modules/j2ee-schema/project.properties
geronimo/trunk/modules/naming-builder/maven.xml
geronimo/trunk/modules/naming-builder/project.properties
geronimo/trunk/modules/security-builder/maven.xml
geronimo/trunk/modules/security-builder/project.properties
geronimo/trunk/modules/service-builder/maven.xml
geronimo/trunk/modules/service-builder/project.properties
geronimo/trunk/modules/web-builder/maven.xml
geronimo/trunk/modules/web-builder/project.properties
Modified: geronimo/trunk/maven.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/maven.xml?rev=232504&r1=232503&r2=232504&view=diff
==============================================================================
--- geronimo/trunk/maven.xml (original)
+++ geronimo/trunk/maven.xml Sat Aug 13 09:17:23 2005
@@ -169,6 +169,12 @@
<goal name="m:eclipse" prereqs="m:init">
<j:set var="goal" value="eclipse"/>
<attainGoal name="multiproject:goal"/>
+ <echo>Fixing up xmlbeans classpath in .classpath files...</echo>
+ <replace dir="${basedir}"
+ value="<classpathentry kind="lib" path="target/xmlbeans-classes">"
+ token="<classpathentry kind="src" path="target/xmlbeans-classes">">
+ <include name="**/.classpath"/>
+ </replace>
</goal>
<goal name="m:jar:deploy" prereqs="m:init">
Modified: geronimo/trunk/modules/axis-builder/maven.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/axis-builder/maven.xml?rev=232504&r1=232503&r2=232504&view=diff
==============================================================================
--- geronimo/trunk/modules/axis-builder/maven.xml (original)
+++ geronimo/trunk/modules/axis-builder/maven.xml Sat Aug 13 09:17:23 2005
@@ -29,6 +29,11 @@
<preGoal name="java:compile">
<xmlbeans:schema2java
maven.xmlbeans2.sourceschema="schema/wsdl.xsd"/>
+ <mkdir dir="${basedir}/target/xmlbeans-classes"/>
+ <mkdir dir="${basedir}/target/xmlbeans-classes/schemaorg_apache_xmlbeans"/>
+ <copy todir="${basedir}/target/xmlbeans-classes/schemaorg_apache_xmlbeans">
+ <ant:fileset dir="${basedir}/target/classes/schemaorg_apache_xmlbeans"/>
+ </copy>
</preGoal>
</project>
Modified: geronimo/trunk/modules/axis-builder/project.properties
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/axis-builder/project.properties?rev=232504&r1=232503&r2=232504&view=diff
==============================================================================
--- geronimo/trunk/modules/axis-builder/project.properties (original)
+++ geronimo/trunk/modules/axis-builder/project.properties Sat Aug 13 09:17:23 2005
@@ -2,7 +2,7 @@
## $Rev: 46019 $ $Date: 2004-09-14 02:56:06 -0700 (Tue, 14 Sep 2004) $
##
-maven.eclipse.classpath.include=${basedir}/target/xmlbeans
+maven.eclipse.classpath.include=${basedir}/target/xmlbeans,${basedir}/target/xmlbeans-classes
maven.idea.generated.source=xmlbeans
maven.junit.sysproperties=geronimo.run.external.webservicetest
Modified: geronimo/trunk/modules/client-builder/maven.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/client-builder/maven.xml?rev=232504&r1=232503&r2=232504&view=diff
==============================================================================
--- geronimo/trunk/modules/client-builder/maven.xml (original)
+++ geronimo/trunk/modules/client-builder/maven.xml Sat Aug 13 09:17:23 2005
@@ -28,5 +28,10 @@
<preGoal name="java:compile">
<xmlbeans:schema2java
maven.xmlbeans2.sourceschema="schema/geronimo-application-client.xsd"/>
+ <mkdir dir="${basedir}/target/xmlbeans-classes"/>
+ <mkdir dir="${basedir}/target/xmlbeans-classes/schemaorg_apache_xmlbeans"/>
+ <copy todir="${basedir}/target/xmlbeans-classes/schemaorg_apache_xmlbeans">
+ <ant:fileset dir="${basedir}/target/classes/schemaorg_apache_xmlbeans"/>
+ </copy>
</preGoal>
</project>
Modified: geronimo/trunk/modules/client-builder/project.properties
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/client-builder/project.properties?rev=232504&r1=232503&r2=232504&view=diff
==============================================================================
--- geronimo/trunk/modules/client-builder/project.properties (original)
+++ geronimo/trunk/modules/client-builder/project.properties Sat Aug 13 09:17:23 2005
@@ -2,5 +2,5 @@
## $Rev: 46019 $ $Date: 2004-09-14 02:56:06 -0700 (Tue, 14 Sep 2004) $
##
-maven.eclipse.classpath.include=${basedir}/target/xmlbeans
+maven.eclipse.classpath.include=${basedir}/target/xmlbeans,${basedir}/target/xmlbeans-classes
maven.idea.generated.source=xmlbeans
Modified: geronimo/trunk/modules/connector-builder/maven.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/connector-builder/maven.xml?rev=232504&r1=232503&r2=232504&view=diff
==============================================================================
--- geronimo/trunk/modules/connector-builder/maven.xml (original)
+++ geronimo/trunk/modules/connector-builder/maven.xml Sat Aug 13 09:17:23 2005
@@ -29,6 +29,11 @@
<preGoal name="java:compile">
<xmlbeans:schema2java
maven.xmlbeans2.sourceschema="schema/geronimo-connector_1_5.xsd"/>
+ <mkdir dir="${basedir}/target/xmlbeans-classes"/>
+ <mkdir dir="${basedir}/target/xmlbeans-classes/schemaorg_apache_xmlbeans"/>
+ <copy todir="${basedir}/target/xmlbeans-classes/schemaorg_apache_xmlbeans">
+ <ant:fileset dir="${basedir}/target/classes/schemaorg_apache_xmlbeans"/>
+ </copy>
</preGoal>
<preGoal name="test:compile">
Modified: geronimo/trunk/modules/connector-builder/project.properties
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/connector-builder/project.properties?rev=232504&r1=232503&r2=232504&view=diff
==============================================================================
--- geronimo/trunk/modules/connector-builder/project.properties (original)
+++ geronimo/trunk/modules/connector-builder/project.properties Sat Aug 13 09:17:23 2005
@@ -3,7 +3,7 @@
##
# Include the generated xmlbean classes in the eclipse classpath
-maven.eclipse.classpath.include=${basedir}/target/xmlbeans
+maven.eclipse.classpath.include=${basedir}/target/xmlbeans,${basedir}/target/xmlbeans-classes
maven.junit.fork=true
maven.junit.jvmargs=-Djava.security.auth.login.config=src/test-data/data/login.config -ea
Modified: geronimo/trunk/modules/j2ee-builder/maven.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/j2ee-builder/maven.xml?rev=232504&r1=232503&r2=232504&view=diff
==============================================================================
--- geronimo/trunk/modules/j2ee-builder/maven.xml (original)
+++ geronimo/trunk/modules/j2ee-builder/maven.xml Sat Aug 13 09:17:23 2005
@@ -28,6 +28,11 @@
<preGoal name="java:compile">
<xmlbeans:schema2java
maven.xmlbeans2.sourceschema="schema/geronimo-application.xsd"/>
+ <mkdir dir="${basedir}/target/xmlbeans-classes"/>
+ <mkdir dir="${basedir}/target/xmlbeans-classes/schemaorg_apache_xmlbeans"/>
+ <copy todir="${basedir}/target/xmlbeans-classes/schemaorg_apache_xmlbeans">
+ <ant:fileset dir="${basedir}/target/classes/schemaorg_apache_xmlbeans"/>
+ </copy>
</preGoal>
<preGoal name="test:compile">
Modified: geronimo/trunk/modules/j2ee-builder/project.properties
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/j2ee-builder/project.properties?rev=232504&r1=232503&r2=232504&view=diff
==============================================================================
--- geronimo/trunk/modules/j2ee-builder/project.properties (original)
+++ geronimo/trunk/modules/j2ee-builder/project.properties Sat Aug 13 09:17:23 2005
@@ -3,6 +3,6 @@
##
# Include the generated xmlbean classes in the eclipse classpath
-maven.eclipse.classpath.include=${basedir}/target/xmlbeans
+maven.eclipse.classpath.include=${basedir}/target/xmlbeans,${basedir}/target/xmlbeans-classes
maven.idea.generated.source=xmlbeans
Modified: geronimo/trunk/modules/j2ee-schema/maven.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/j2ee-schema/maven.xml?rev=232504&r1=232503&r2=232504&view=diff
==============================================================================
--- geronimo/trunk/modules/j2ee-schema/maven.xml (original)
+++ geronimo/trunk/modules/j2ee-schema/maven.xml Sat Aug 13 09:17:23 2005
@@ -32,6 +32,11 @@
maven.xmlbeans2.xmlconfigs="${basedir}/src/conf/xmlconfig.xml"
maven.xmlbeans2.targetdir="${basedir}/target/xmlbeans"
maven.xmlbeans2.cataloglocation="${basedir}/src/catalog/resolver-catalog.xml"/>
+ <mkdir dir="${basedir}/target/xmlbeans-classes"/>
+ <mkdir dir="${basedir}/target/xmlbeans-classes/schemaorg_apache_xmlbeans"/>
+ <copy todir="${basedir}/target/xmlbeans-classes/schemaorg_apache_xmlbeans">
+ <ant:fileset dir="${basedir}/target/classes/schemaorg_apache_xmlbeans"/>
+ </copy>
</preGoal>
<postGoal name="xdoc:register-reports">
Modified: geronimo/trunk/modules/j2ee-schema/project.properties
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/j2ee-schema/project.properties?rev=232504&r1=232503&r2=232504&view=diff
==============================================================================
--- geronimo/trunk/modules/j2ee-schema/project.properties (original)
+++ geronimo/trunk/modules/j2ee-schema/project.properties Sat Aug 13 09:17:23 2005
@@ -3,7 +3,7 @@
##
# Include the generated xmlbean classes in the eclipse classpath
-maven.eclipse.classpath.include=${basedir}/target/xmlbeans
+maven.eclipse.classpath.include=${basedir}/target/xmlbeans,${basedir}/target/xmlbeans-classes
maven.idea.generated.source=xmlbeans
Modified: geronimo/trunk/modules/naming-builder/maven.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/naming-builder/maven.xml?rev=232504&r1=232503&r2=232504&view=diff
==============================================================================
--- geronimo/trunk/modules/naming-builder/maven.xml (original)
+++ geronimo/trunk/modules/naming-builder/maven.xml Sat Aug 13 09:17:23 2005
@@ -25,6 +25,11 @@
<preGoal name="java:compile">
<xmlbeans:schema2java
maven.xmlbeans2.sourceschema="schema/geronimo-naming.xsd"/>
+ <mkdir dir="${basedir}/target/xmlbeans-classes"/>
+ <mkdir dir="${basedir}/target/xmlbeans-classes/schemaorg_apache_xmlbeans"/>
+ <copy todir="${basedir}/target/xmlbeans-classes/schemaorg_apache_xmlbeans">
+ <fileset dir="${basedir}/target/classes/schemaorg_apache_xmlbeans"/>
+ </copy>
</preGoal>
</project>
Modified: geronimo/trunk/modules/naming-builder/project.properties
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/naming-builder/project.properties?rev=232504&r1=232503&r2=232504&view=diff
==============================================================================
--- geronimo/trunk/modules/naming-builder/project.properties (original)
+++ geronimo/trunk/modules/naming-builder/project.properties Sat Aug 13 09:17:23 2005
@@ -1,5 +1,5 @@
##
## $Rev: 46019 $ $Date: 2004-09-14 02:56:06 -0700 (Tue, 14 Sep 2004) $
##
-maven.eclipse.classpath.include=${basedir}/target/xmlbeans
+maven.eclipse.classpath.include=${basedir}/target/xmlbeans,${basedir}/target/xmlbeans-classes
maven.idea.generated.source=xmlbeans
Modified: geronimo/trunk/modules/security-builder/maven.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/security-builder/maven.xml?rev=232504&r1=232503&r2=232504&view=diff
==============================================================================
--- geronimo/trunk/modules/security-builder/maven.xml (original)
+++ geronimo/trunk/modules/security-builder/maven.xml Sat Aug 13 09:17:23 2005
@@ -32,6 +32,11 @@
<preGoal name="java:compile">
<xmlbeans:schema2java
maven.xmlbeans2.sourceschema="schema/geronimo-security.xsd,schema/geronimo-login-config.xsd"/>
+ <mkdir dir="${basedir}/target/xmlbeans-classes"/>
+ <mkdir dir="${basedir}/target/xmlbeans-classes/schemaorg_apache_xmlbeans"/>
+ <copy todir="${basedir}/target/xmlbeans-classes/schemaorg_apache_xmlbeans">
+ <ant:fileset dir="${basedir}/target/classes/schemaorg_apache_xmlbeans"/>
+ </copy>
</preGoal>
<!-- Set up the test files -->
Modified: geronimo/trunk/modules/security-builder/project.properties
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/security-builder/project.properties?rev=232504&r1=232503&r2=232504&view=diff
==============================================================================
--- geronimo/trunk/modules/security-builder/project.properties (original)
+++ geronimo/trunk/modules/security-builder/project.properties Sat Aug 13 09:17:23 2005
@@ -22,6 +22,6 @@
maven.junit.jvmargs=-Djava.security.auth.login.config=src/test-data/data/login.config -Dlog4j.configuration=file:log4j.properties -ea
maven.junit.fork=true
# Include the generated xmlbean classes in the eclipse classpath
-maven.eclipse.classpath.include=${basedir}/target/xmlbeans
+maven.eclipse.classpath.include=${basedir}/target/xmlbeans,${basedir}/target/xmlbeans-classes
maven.idea.generated.source=xmlbeans
Modified: geronimo/trunk/modules/service-builder/maven.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/service-builder/maven.xml?rev=232504&r1=232503&r2=232504&view=diff
==============================================================================
--- geronimo/trunk/modules/service-builder/maven.xml (original)
+++ geronimo/trunk/modules/service-builder/maven.xml Sat Aug 13 09:17:23 2005
@@ -25,6 +25,11 @@
<preGoal name="java:compile">
<xmlbeans:schema2java
maven.xmlbeans2.sourceschema="schema/geronimo-config.xsd,schema/geronimo-service.xsd,schema/geronimo-javabean-xmlattribute.xsd"/>
+ <mkdir dir="${basedir}/target/xmlbeans-classes"/>
+ <mkdir dir="${basedir}/target/xmlbeans-classes/schemaorg_apache_xmlbeans"/>
+ <copy todir="${basedir}/target/xmlbeans-classes/schemaorg_apache_xmlbeans">
+ <fileset dir="${basedir}/target/classes/schemaorg_apache_xmlbeans"/>
+ </copy>
</preGoal>
</project>
Modified: geronimo/trunk/modules/service-builder/project.properties
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/service-builder/project.properties?rev=232504&r1=232503&r2=232504&view=diff
==============================================================================
--- geronimo/trunk/modules/service-builder/project.properties (original)
+++ geronimo/trunk/modules/service-builder/project.properties Sat Aug 13 09:17:23 2005
@@ -3,6 +3,6 @@
##
# Include the generated xmlbean classes in the eclipse classpath
-maven.eclipse.classpath.include=${basedir}/target/xmlbeans
+maven.eclipse.classpath.include=${basedir}/target/xmlbeans,${basedir}/target/xmlbeans-classes
maven.idea.generated.source=xmlbeans
Modified: geronimo/trunk/modules/web-builder/maven.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/web-builder/maven.xml?rev=232504&r1=232503&r2=232504&view=diff
==============================================================================
--- geronimo/trunk/modules/web-builder/maven.xml (original)
+++ geronimo/trunk/modules/web-builder/maven.xml Sat Aug 13 09:17:23 2005
@@ -28,6 +28,11 @@
<preGoal name="java:compile">
<xmlbeans:schema2java
maven.xmlbeans2.sourceschema="schema/geronimo-web.xsd"/>
+ <mkdir dir="${basedir}/target/xmlbeans-classes"/>
+ <mkdir dir="${basedir}/target/xmlbeans-classes/schemaorg_apache_xmlbeans"/>
+ <copy todir="${basedir}/target/xmlbeans-classes/schemaorg_apache_xmlbeans">
+ <ant:fileset dir="${basedir}/target/classes/schemaorg_apache_xmlbeans"/>
+ </copy>
</preGoal>
</project>
Modified: geronimo/trunk/modules/web-builder/project.properties
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/web-builder/project.properties?rev=232504&r1=232503&r2=232504&view=diff
==============================================================================
--- geronimo/trunk/modules/web-builder/project.properties (original)
+++ geronimo/trunk/modules/web-builder/project.properties Sat Aug 13 09:17:23 2005
@@ -6,6 +6,6 @@
maven.junit.fork=true
# Include the generated xmlbean classes in the eclipse classpath
-maven.eclipse.classpath.include=${basedir}/target/xmlbeans
+maven.eclipse.classpath.include=${basedir}/target/xmlbeans,${basedir}/target/xmlbeans-classes
maven.idea.generated.source=xmlbeans