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/25 22:36:51 UTC
svn commit: r588345 - in /geronimo/devtools/j2g/trunk/plugins:
org.apache.geronimo.devtools.j2g.common/
org.apache.geronimo.devtools.j2g.descriptors/
org.apache.geronimo.devtools.j2g.jasper/
org.apache.geronimo.devtools.j2g.jasper/META-INF/ org.apache....
Author: linsun
Date: Thu Oct 25 13:36:49 2007
New Revision: 588345
URL: http://svn.apache.org/viewvc?rev=588345&view=rev
Log:
various updates to eclipse .classpath and .project, manifest.mf to make all the build errors go away in eclipse. (only build error remains is in test folder).
Modified:
geronimo/devtools/j2g/trunk/plugins/org.apache.geronimo.devtools.j2g.common/.classpath
geronimo/devtools/j2g/trunk/plugins/org.apache.geronimo.devtools.j2g.common/.project
geronimo/devtools/j2g/trunk/plugins/org.apache.geronimo.devtools.j2g.descriptors/.classpath
geronimo/devtools/j2g/trunk/plugins/org.apache.geronimo.devtools.j2g.descriptors/.project
geronimo/devtools/j2g/trunk/plugins/org.apache.geronimo.devtools.j2g.jasper/.classpath
geronimo/devtools/j2g/trunk/plugins/org.apache.geronimo.devtools.j2g.jasper/.project
geronimo/devtools/j2g/trunk/plugins/org.apache.geronimo.devtools.j2g.jasper/META-INF/MANIFEST.MF
geronimo/devtools/j2g/trunk/plugins/org.apache.geronimo.devtools.j2g.resources/.classpath
geronimo/devtools/j2g/trunk/plugins/org.apache.geronimo.devtools.j2g.sources/.classpath
geronimo/devtools/j2g/trunk/plugins/org.apache.geronimo.devtools.j2g.sources/.project
geronimo/devtools/j2g/trunk/plugins/org.apache.geronimo.devtools.j2g.sources/META-INF/MANIFEST.MF
geronimo/devtools/j2g/trunk/plugins/org.apache.geronimo.devtools.j2g.ui/.classpath
geronimo/devtools/j2g/trunk/plugins/org.apache.geronimo.devtools.j2g.ui/.project
geronimo/devtools/j2g/trunk/plugins/org.apache.geronimo.devtools.j2g.util/.classpath
geronimo/devtools/j2g/trunk/plugins/org.apache.geronimo.devtools.j2g.util/.project
geronimo/devtools/j2g/trunk/plugins/org.apache.geronimo.devtools.j2g.util/META-INF/MANIFEST.MF
geronimo/devtools/j2g/trunk/plugins/org.apache.geronimo.devtools.j2g.util/build.properties
Modified: geronimo/devtools/j2g/trunk/plugins/org.apache.geronimo.devtools.j2g.common/.classpath
URL: http://svn.apache.org/viewvc/geronimo/devtools/j2g/trunk/plugins/org.apache.geronimo.devtools.j2g.common/.classpath?rev=588345&r1=588344&r2=588345&view=diff
==============================================================================
--- geronimo/devtools/j2g/trunk/plugins/org.apache.geronimo.devtools.j2g.common/.classpath (original)
+++ geronimo/devtools/j2g/trunk/plugins/org.apache.geronimo.devtools.j2g.common/.classpath Thu Oct 25 13:36:49 2007
@@ -1,6 +1,7 @@
<classpath>
- <classpathentry kind="src" path="." including="plugin.xml" excluding="**/*.java"/>
+ <classpathentry kind="src" path="." including="LICENSE.txt|NOTICE.txt" excluding="**/*.java"/>
<classpathentry kind="src" path="src"/>
<classpathentry kind="output" path="target/classes"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+ <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
</classpath>
Modified: geronimo/devtools/j2g/trunk/plugins/org.apache.geronimo.devtools.j2g.common/.project
URL: http://svn.apache.org/viewvc/geronimo/devtools/j2g/trunk/plugins/org.apache.geronimo.devtools.j2g.common/.project?rev=588345&r1=588344&r2=588345&view=diff
==============================================================================
--- geronimo/devtools/j2g/trunk/plugins/org.apache.geronimo.devtools.j2g.common/.project (original)
+++ geronimo/devtools/j2g/trunk/plugins/org.apache.geronimo.devtools.j2g.common/.project Thu Oct 25 13:36:49 2007
@@ -12,6 +12,15 @@
<buildCommand>
<name>org.eclipse.pde.SchemaBuilder</name>
</buildCommand>
+ <buildCommand>
+ <name>org.eclipse.ui.externaltools.ExternalToolBuilder</name>
+ <arguments>
+ <dictionary>
+ <key>LaunchConfigHandle</key>
+ <value><project>/.externalToolBuilders/Maven_Ant_Builder.launch</value>
+ </dictionary>
+ </arguments>
+ </buildCommand>
</buildSpec>
<natures>
<nature>org.eclipse.pde.PluginNature</nature>
Modified: geronimo/devtools/j2g/trunk/plugins/org.apache.geronimo.devtools.j2g.descriptors/.classpath
URL: http://svn.apache.org/viewvc/geronimo/devtools/j2g/trunk/plugins/org.apache.geronimo.devtools.j2g.descriptors/.classpath?rev=588345&r1=588344&r2=588345&view=diff
==============================================================================
--- geronimo/devtools/j2g/trunk/plugins/org.apache.geronimo.devtools.j2g.descriptors/.classpath (original)
+++ geronimo/devtools/j2g/trunk/plugins/org.apache.geronimo.devtools.j2g.descriptors/.classpath Thu Oct 25 13:36:49 2007
@@ -3,6 +3,6 @@
<classpathentry kind="src" path="test"/>
<classpathentry kind="src" path="src"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
- <classpathentry kind="src" path="/org.apache.geronimo.devtools.j2g.common"/>
+ <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
<classpathentry kind="output" path="target/classes"/>
</classpath>
Modified: geronimo/devtools/j2g/trunk/plugins/org.apache.geronimo.devtools.j2g.descriptors/.project
URL: http://svn.apache.org/viewvc/geronimo/devtools/j2g/trunk/plugins/org.apache.geronimo.devtools.j2g.descriptors/.project?rev=588345&r1=588344&r2=588345&view=diff
==============================================================================
--- geronimo/devtools/j2g/trunk/plugins/org.apache.geronimo.devtools.j2g.descriptors/.project (original)
+++ geronimo/devtools/j2g/trunk/plugins/org.apache.geronimo.devtools.j2g.descriptors/.project Thu Oct 25 13:36:49 2007
@@ -3,6 +3,7 @@
<comment>JBoss to Geronimo Conversion Tool</comment>
<projects>
<project>org.apache.geronimo.devtools.j2g.common</project>
+ <project>org.apache.geronimo.devtools.j2g.util</project>
</projects>
<buildSpec>
<buildCommand>
Modified: geronimo/devtools/j2g/trunk/plugins/org.apache.geronimo.devtools.j2g.jasper/.classpath
URL: http://svn.apache.org/viewvc/geronimo/devtools/j2g/trunk/plugins/org.apache.geronimo.devtools.j2g.jasper/.classpath?rev=588345&r1=588344&r2=588345&view=diff
==============================================================================
--- geronimo/devtools/j2g/trunk/plugins/org.apache.geronimo.devtools.j2g.jasper/.classpath (original)
+++ geronimo/devtools/j2g/trunk/plugins/org.apache.geronimo.devtools.j2g.jasper/.classpath Thu Oct 25 13:36:49 2007
@@ -4,18 +4,12 @@
<classpathentry kind="src" path="src"/>
<classpathentry kind="output" path="target/classes"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
- <classpathentry kind="var" path="M2_REPO/avalon-framework/avalon-framework/4.1.3/avalon-framework-4.1.3.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/apache/geronimo/specs/geronimo-jsp_2.0_spec/1.1/geronimo-jsp_2.0_spec-1.1.jar"/>
- <classpathentry kind="var" path="M2_REPO/tomcat/jasper-compiler/5.5.15/jasper-compiler-5.5.15.jar"/>
- <classpathentry kind="var" path="M2_REPO/log4j/log4j/1.2.12/log4j-1.2.12.jar"/>
- <classpathentry kind="var" path="M2_REPO/tomcat/jasper-runtime/5.5.15/jasper-runtime-5.5.15.jar"/>
- <classpathentry kind="var" path="M2_REPO/javax/servlet/servlet-api/2.3/servlet-api-2.3.jar"/>
- <classpathentry kind="var" path="M2_REPO/logkit/logkit/1.0.1/logkit-1.0.1.jar"/>
- <classpathentry kind="var" path="M2_REPO/commons-logging/commons-logging/1.1/commons-logging-1.1.jar"/>
- <classpathentry kind="var" path="M2_REPO/tomcat/jasper-compiler-jdt/5.5.15/jasper-compiler-jdt-5.5.15.jar"/>
- <classpathentry kind="var" path="M2_REPO/ant/ant/1.6.5/ant-1.6.5.jar"/>
- <classpathentry kind="var" path="M2_REPO/commons-el/commons-el/1.0/commons-el-1.0.jar"/>
- <classpathentry kind="src" path="/org.apache.geronimo.devtools.j2g.common"/>
- <classpathentry kind="var" path="M2_REPO/javax/servlet/jsp-api/2.0/jsp-api-2.0.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/apache/geronimo/specs/geronimo-servlet_2.4_spec/1.1.1/geronimo-servlet_2.4_spec-1.1.1.jar"/>
+ <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+ <classpathentry exported="true" kind="lib" path="lib/geronimo-jsp_2.0_spec-1.1.jar"/>
+ <classpathentry exported="true" kind="lib" path="lib/jasper-compiler-5.5.15.jar"/>
+ <classpathentry exported="true" kind="lib" path="lib/jasper-runtime-5.5.15.jar"/>
+ <classpathentry exported="true" kind="lib" path="lib/commons-logging-1.1.jar"/>
+ <classpathentry exported="true" kind="lib" path="lib/jasper-compiler-jdt-5.5.15.jar"/>
+ <classpathentry exported="true" kind="lib" path="lib/commons-el-1.0.jar"/>
+ <classpathentry exported="true" kind="lib" path="lib/geronimo-servlet_2.4_spec-1.1.1.jar"/>
</classpath>
Modified: geronimo/devtools/j2g/trunk/plugins/org.apache.geronimo.devtools.j2g.jasper/.project
URL: http://svn.apache.org/viewvc/geronimo/devtools/j2g/trunk/plugins/org.apache.geronimo.devtools.j2g.jasper/.project?rev=588345&r1=588344&r2=588345&view=diff
==============================================================================
--- geronimo/devtools/j2g/trunk/plugins/org.apache.geronimo.devtools.j2g.jasper/.project (original)
+++ geronimo/devtools/j2g/trunk/plugins/org.apache.geronimo.devtools.j2g.jasper/.project Thu Oct 25 13:36:49 2007
@@ -14,15 +14,6 @@
<buildCommand>
<name>org.eclipse.pde.SchemaBuilder</name>
</buildCommand>
- <buildCommand>
- <name>org.eclipse.ui.externaltools.ExternalToolBuilder</name>
- <arguments>
- <dictionary>
- <key>LaunchConfigHandle</key>
- <value><project>/.externalToolBuilders/Maven_Ant_Builder.launch</value>
- </dictionary>
- </arguments>
- </buildCommand>
</buildSpec>
<natures>
<nature>org.eclipse.pde.PluginNature</nature>
Modified: geronimo/devtools/j2g/trunk/plugins/org.apache.geronimo.devtools.j2g.jasper/META-INF/MANIFEST.MF
URL: http://svn.apache.org/viewvc/geronimo/devtools/j2g/trunk/plugins/org.apache.geronimo.devtools.j2g.jasper/META-INF/MANIFEST.MF?rev=588345&r1=588344&r2=588345&view=diff
==============================================================================
--- geronimo/devtools/j2g/trunk/plugins/org.apache.geronimo.devtools.j2g.jasper/META-INF/MANIFEST.MF (original)
+++ geronimo/devtools/j2g/trunk/plugins/org.apache.geronimo.devtools.j2g.jasper/META-INF/MANIFEST.MF Thu Oct 25 13:36:49 2007
@@ -4,7 +4,7 @@
Bundle-SymbolicName: org.apache.geronimo.devtools.j2g.jasper;singleton:=true
Bundle-Version: 1.1.0
Bundle-Vendor: Apache.org
-Bundle-ClassPath: .,
+Bundle-ClassPath:
lib/commons-el-1.0.jar,
lib/commons-logging-1.1.jar,
lib/geronimo-jsp_2.0_spec-1.1.jar,
Modified: geronimo/devtools/j2g/trunk/plugins/org.apache.geronimo.devtools.j2g.resources/.classpath
URL: http://svn.apache.org/viewvc/geronimo/devtools/j2g/trunk/plugins/org.apache.geronimo.devtools.j2g.resources/.classpath?rev=588345&r1=588344&r2=588345&view=diff
==============================================================================
--- geronimo/devtools/j2g/trunk/plugins/org.apache.geronimo.devtools.j2g.resources/.classpath (original)
+++ geronimo/devtools/j2g/trunk/plugins/org.apache.geronimo.devtools.j2g.resources/.classpath Thu Oct 25 13:36:49 2007
@@ -3,6 +3,6 @@
<classpathentry kind="src" path="test"/>
<classpathentry kind="src" path="src"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
- <classpathentry kind="src" path="/org.apache.geronimo.devtools.j2g.common"/>
+ <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
<classpathentry kind="output" path="target/classes"/>
</classpath>
Modified: geronimo/devtools/j2g/trunk/plugins/org.apache.geronimo.devtools.j2g.sources/.classpath
URL: http://svn.apache.org/viewvc/geronimo/devtools/j2g/trunk/plugins/org.apache.geronimo.devtools.j2g.sources/.classpath?rev=588345&r1=588344&r2=588345&view=diff
==============================================================================
--- geronimo/devtools/j2g/trunk/plugins/org.apache.geronimo.devtools.j2g.sources/.classpath (original)
+++ geronimo/devtools/j2g/trunk/plugins/org.apache.geronimo.devtools.j2g.sources/.classpath Thu Oct 25 13:36:49 2007
@@ -1,22 +1,7 @@
<classpath>
<classpathentry kind="src" path="." including="plugin.xml" excluding="**/*.java"/>
- <classpathentry kind="src" path="src"/>
+ <classpathentry kind="src" path="src"/>
<classpathentry kind="output" path="target/classes"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
- <classpathentry kind="var" path="M2_REPO/tomcat/jasper-compiler/5.5.15/jasper-compiler-5.5.15.jar"/>
- <classpathentry kind="var" path="M2_REPO/log4j/log4j/1.2.12/log4j-1.2.12.jar"/>
- <classpathentry kind="src" path="/org.apache.geronimo.j2g.jasper"/>
- <classpathentry kind="var" path="M2_REPO/commons-el/commons-el/1.0/commons-el-1.0.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/apache/geronimo/specs/geronimo-jsp_2.0_spec/1.1/geronimo-jsp_2.0_spec-1.1.jar"/>
- <classpathentry kind="var" path="M2_REPO/logkit/logkit/1.0.1/logkit-1.0.1.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/eclipse/jdt/core/3.2.0.666/core-3.2.0.666.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/apache/geronimo/specs/geronimo-servlet_2.4_spec/1.1.1/geronimo-servlet_2.4_spec-1.1.1.jar"/>
- <classpathentry kind="var" path="M2_REPO/avalon-framework/avalon-framework/4.1.3/avalon-framework-4.1.3.jar"/>
- <classpathentry kind="src" path="/org.apache.geronimo.j2g.common"/>
- <classpathentry kind="var" path="M2_REPO/tomcat/jasper-runtime/5.5.15/jasper-runtime-5.5.15.jar"/>
- <classpathentry kind="var" path="M2_REPO/ant/ant/1.6.5/ant-1.6.5.jar"/>
- <classpathentry kind="var" path="M2_REPO/javax/servlet/servlet-api/2.3/servlet-api-2.3.jar"/>
- <classpathentry kind="var" path="M2_REPO/javax/servlet/jsp-api/2.0/jsp-api-2.0.jar"/>
- <classpathentry kind="var" path="M2_REPO/tomcat/jasper-compiler-jdt/5.5.15/jasper-compiler-jdt-5.5.15.jar"/>
- <classpathentry kind="var" path="M2_REPO/commons-logging/commons-logging/1.1/commons-logging-1.1.jar"/>
+ <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
</classpath>
Modified: geronimo/devtools/j2g/trunk/plugins/org.apache.geronimo.devtools.j2g.sources/.project
URL: http://svn.apache.org/viewvc/geronimo/devtools/j2g/trunk/plugins/org.apache.geronimo.devtools.j2g.sources/.project?rev=588345&r1=588344&r2=588345&view=diff
==============================================================================
--- geronimo/devtools/j2g/trunk/plugins/org.apache.geronimo.devtools.j2g.sources/.project (original)
+++ geronimo/devtools/j2g/trunk/plugins/org.apache.geronimo.devtools.j2g.sources/.project Thu Oct 25 13:36:49 2007
@@ -3,6 +3,7 @@
<comment>JBoss to Geronimo Conversion Tool</comment>
<projects>
<project>org.apache.geronimo.devtools.j2g.jasper</project>
+ <project>org.apache.geronimo.devtools.j2g.util</project>
<project>org.apache.geronimo.devtools.j2g.common</project>
</projects>
<buildSpec>
@@ -20,4 +21,4 @@
<nature>org.eclipse.pde.PluginNature</nature>
<nature>org.eclipse.jdt.core.javanature</nature>
</natures>
-</projectDescription>
+</projectDescription>
\ No newline at end of file
Modified: geronimo/devtools/j2g/trunk/plugins/org.apache.geronimo.devtools.j2g.sources/META-INF/MANIFEST.MF
URL: http://svn.apache.org/viewvc/geronimo/devtools/j2g/trunk/plugins/org.apache.geronimo.devtools.j2g.sources/META-INF/MANIFEST.MF?rev=588345&r1=588344&r2=588345&view=diff
==============================================================================
--- geronimo/devtools/j2g/trunk/plugins/org.apache.geronimo.devtools.j2g.sources/META-INF/MANIFEST.MF (original)
+++ geronimo/devtools/j2g/trunk/plugins/org.apache.geronimo.devtools.j2g.sources/META-INF/MANIFEST.MF Thu Oct 25 13:36:49 2007
@@ -4,9 +4,9 @@
Bundle-SymbolicName: org.apache.geronimo.devtools.j2g.sources;singleton:=true
Bundle-Version: 1.1.0
Bundle-Localization: plugin
-Require-Bundle: org.apache.geronimo.devtools.j2g.common,
+Require-Bundle: org.apache.geronimo.devtools.j2g.util,
+ org.apache.geronimo.devtools.j2g.common,
org.apache.geronimo.devtools.j2g.jasper,
- org.apache.geronimo.devtools.j2g.util,
org.eclipse.core.resources,
org.eclipse.core.runtime,
org.eclipse.jdt,
@@ -19,5 +19,4 @@
lib/geronimo-util-1.1.jar
Export-Package: org.apache.geronimo.devtools.j2g.sources,
org.apache.geronimo.devtools.j2g.sources.dependence,
- org.apache.geronimo.devtools.j2g.sources.dependence.compatibility,
org.apache.geronimo.devtools.j2g.sources.environment
Modified: geronimo/devtools/j2g/trunk/plugins/org.apache.geronimo.devtools.j2g.ui/.classpath
URL: http://svn.apache.org/viewvc/geronimo/devtools/j2g/trunk/plugins/org.apache.geronimo.devtools.j2g.ui/.classpath?rev=588345&r1=588344&r2=588345&view=diff
==============================================================================
--- geronimo/devtools/j2g/trunk/plugins/org.apache.geronimo.devtools.j2g.ui/.classpath (original)
+++ geronimo/devtools/j2g/trunk/plugins/org.apache.geronimo.devtools.j2g.ui/.classpath Thu Oct 25 13:36:49 2007
@@ -1,9 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
- <classpathentry excluding="**/*.java" including="plugin.xml" kind="src" path=""/>
- <classpathentry excluding="**/*.java" including="*.jar" kind="src" path="lib"/>
<classpathentry kind="src" path="src"/>
- <classpathentry kind="src" output="target/test-classes" path="test"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+ <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
<classpathentry kind="output" path="target/classes"/>
</classpath>
Modified: geronimo/devtools/j2g/trunk/plugins/org.apache.geronimo.devtools.j2g.ui/.project
URL: http://svn.apache.org/viewvc/geronimo/devtools/j2g/trunk/plugins/org.apache.geronimo.devtools.j2g.ui/.project?rev=588345&r1=588344&r2=588345&view=diff
==============================================================================
--- geronimo/devtools/j2g/trunk/plugins/org.apache.geronimo.devtools.j2g.ui/.project (original)
+++ geronimo/devtools/j2g/trunk/plugins/org.apache.geronimo.devtools.j2g.ui/.project Thu Oct 25 13:36:49 2007
@@ -20,15 +20,6 @@
<arguments>
</arguments>
</buildCommand>
- <buildCommand>
- <name>org.eclipse.ui.externaltools.ExternalToolBuilder</name>
- <arguments>
- <dictionary>
- <key>LaunchConfigHandle</key>
- <value><project>/.externalToolBuilders/Maven_Ant_Builder.launch</value>
- </dictionary>
- </arguments>
- </buildCommand>
</buildSpec>
<natures>
<nature>org.eclipse.jdt.core.javanature</nature>
Modified: geronimo/devtools/j2g/trunk/plugins/org.apache.geronimo.devtools.j2g.util/.classpath
URL: http://svn.apache.org/viewvc/geronimo/devtools/j2g/trunk/plugins/org.apache.geronimo.devtools.j2g.util/.classpath?rev=588345&r1=588344&r2=588345&view=diff
==============================================================================
--- geronimo/devtools/j2g/trunk/plugins/org.apache.geronimo.devtools.j2g.util/.classpath (original)
+++ geronimo/devtools/j2g/trunk/plugins/org.apache.geronimo.devtools.j2g.util/.classpath Thu Oct 25 13:36:49 2007
@@ -1,24 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
<classpath>
- <classpathentry kind="src" path="." including="plugin.xml" excluding="**/*.java"/>
- <classpathentry kind="src" path="lib" including="*.jar" excluding="**/*.java"/>
- <classpathentry kind="src" path="src"/>
- <classpathentry kind="src" path="test" output="target/test-classes"/>
- <classpathentry kind="output" path="target/classes"/>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
- <classpathentry kind="var" path="M2_REPO/pull-parser/pull-parser/2.1.10/pull-parser-2.1.10.jar"/>
- <classpathentry kind="var" path="M2_REPO/commons-logging/commons-logging/1.1/commons-logging-1.1.jar"/>
- <classpathentry kind="var" path="M2_REPO/jdom/jdom/1.0/jdom-1.0.jar"/>
- <classpathentry kind="var" path="M2_REPO/junit/junit/4.3.1/junit-4.3.1.jar"/>
- <classpathentry kind="var" path="M2_REPO/javax/servlet/servlet-api/2.3/servlet-api-2.3.jar"/>
- <classpathentry kind="var" path="M2_REPO/xerces/xmlParserAPIs/2.6.2/xmlParserAPIs-2.6.2.jar"/>
- <classpathentry kind="var" path="M2_REPO/dom4j/dom4j/1.6.1/dom4j-1.6.1.jar"/>
- <classpathentry kind="var" path="M2_REPO/log4j/log4j/1.2.12/log4j-1.2.12.jar"/>
- <classpathentry kind="var" path="M2_REPO/logkit/logkit/1.0.1/logkit-1.0.1.jar"/>
- <classpathentry kind="var" path="M2_REPO/xerces/xercesImpl/2.6.2/xercesImpl-2.6.2.jar"/>
- <classpathentry kind="var" path="M2_REPO/avalon-framework/avalon-framework/4.1.3/avalon-framework-4.1.3.jar"/>
- <classpathentry kind="var" path="M2_REPO/com/ibm/icu/icu4j/2.6.1/icu4j-2.6.1.jar"/>
- <classpathentry kind="var" path="M2_REPO/xom/xom/1.0/xom-1.0.jar"/>
- <classpathentry kind="var" path="M2_REPO/xalan/xalan/2.6.0/xalan-2.6.0.jar"/>
- <classpathentry kind="var" path="M2_REPO/xml-apis/xml-apis/1.0.b2/xml-apis-1.0.b2.jar"/>
- <classpathentry kind="var" path="M2_REPO/jaxen/jaxen/1.1/jaxen-1.1.jar"/>
-</classpath>
\ No newline at end of file
+ <classpathentry excluding="**/*.java" including="plugin.xml" kind="src" path=""/>
+ <classpathentry excluding="**/*.java" including="*.jar" kind="src" path="lib"/>
+ <classpathentry kind="src" path="src"/>
+ <classpathentry kind="src" output="target/test-classes" path="test"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+ <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+ <classpathentry exported="true" kind="lib" path="lib/pull-parser-2.1.10.jar"/>
+ <classpathentry exported="true" kind="lib" path="lib/commons-logging-1.1.jar"/>
+ <classpathentry exported="true" kind="lib" path="lib/dom4j-1.6.1.jar"/>
+ <classpathentry exported="true" kind="lib" path="lib/jaxen-1.1.jar"/>
+ <classpathentry kind="output" path="target/classes"/>
+</classpath>
Modified: geronimo/devtools/j2g/trunk/plugins/org.apache.geronimo.devtools.j2g.util/.project
URL: http://svn.apache.org/viewvc/geronimo/devtools/j2g/trunk/plugins/org.apache.geronimo.devtools.j2g.util/.project?rev=588345&r1=588344&r2=588345&view=diff
==============================================================================
--- geronimo/devtools/j2g/trunk/plugins/org.apache.geronimo.devtools.j2g.util/.project (original)
+++ geronimo/devtools/j2g/trunk/plugins/org.apache.geronimo.devtools.j2g.util/.project Thu Oct 25 13:36:49 2007
@@ -12,15 +12,6 @@
<buildCommand>
<name>org.eclipse.pde.SchemaBuilder</name>
</buildCommand>
- <buildCommand>
- <name>org.eclipse.ui.externaltools.ExternalToolBuilder</name>
- <arguments>
- <dictionary>
- <key>LaunchConfigHandle</key>
- <value><project>/.externalToolBuilders/Maven_Ant_Builder.launch</value>
- </dictionary>
- </arguments>
- </buildCommand>
</buildSpec>
<natures>
<nature>org.eclipse.pde.PluginNature</nature>
Modified: geronimo/devtools/j2g/trunk/plugins/org.apache.geronimo.devtools.j2g.util/META-INF/MANIFEST.MF
URL: http://svn.apache.org/viewvc/geronimo/devtools/j2g/trunk/plugins/org.apache.geronimo.devtools.j2g.util/META-INF/MANIFEST.MF?rev=588345&r1=588344&r2=588345&view=diff
==============================================================================
--- geronimo/devtools/j2g/trunk/plugins/org.apache.geronimo.devtools.j2g.util/META-INF/MANIFEST.MF (original)
+++ geronimo/devtools/j2g/trunk/plugins/org.apache.geronimo.devtools.j2g.util/META-INF/MANIFEST.MF Thu Oct 25 13:36:49 2007
@@ -5,17 +5,12 @@
Bundle-Version: 1.1.0
Bundle-Vendor: Apache.org
Require-Bundle: org.eclipse.core.runtime
-Bundle-ClassPath: .,
+Bundle-ClassPath:
lib/commons-logging-1.1.jar,
lib/dom4j-1.6.1.jar,
lib/jaxen-1.1.jar,
- lib/junit-4.3.1.jar,
lib/pull-parser-2.1.10.jar
Export-Package:
- junit.extensions,
- junit.framework,
- junit.runner,
- junit.textui,
org.apache.commons.logging,
org.apache.commons.logging.impl,
org.apache.geronimo.devtools.j2g.util.descriptors,
@@ -63,13 +58,5 @@
org.jaxen.saxpath.helpers,
org.jaxen.util,
org.jaxen.xom,
- org.junit,
- org.junit.internal,
- org.junit.internal.requests,
- org.junit.internal.runners,
- org.junit.runner,
- org.junit.runner.manipulation,
- org.junit.runner.notification,
- org.junit.runners,
org.w3c.dom
Modified: geronimo/devtools/j2g/trunk/plugins/org.apache.geronimo.devtools.j2g.util/build.properties
URL: http://svn.apache.org/viewvc/geronimo/devtools/j2g/trunk/plugins/org.apache.geronimo.devtools.j2g.util/build.properties?rev=588345&r1=588344&r2=588345&view=diff
==============================================================================
--- geronimo/devtools/j2g/trunk/plugins/org.apache.geronimo.devtools.j2g.util/build.properties (original)
+++ geronimo/devtools/j2g/trunk/plugins/org.apache.geronimo.devtools.j2g.util/build.properties Thu Oct 25 13:36:49 2007
@@ -20,10 +20,6 @@
META-INF/,\
.,\
lib/dom4j-1.6.1.jar,\
- lib/jaxen-1.1-beta-6.jar,\
- lib/junit-3.8.1.jar,\
- lib/pull-parser-2.1.10.jar,\
- lib/commons-logging-api-1.1.jar,\
- lib/commons-logging-1.1.jar,\
lib/jaxen-1.1.jar,\
- lib/junit-4.3.1.jar
+ lib/pull-parser-2.1.10.jar,\
+ lib/commons-logging-1.1.jar
Re: svn commit: r588345 - in /geronimo/devtools/j2g/trunk/plugins:
org.apache.geronimo.devtools.j2g.common/ org.apache.geronimo.devtools.j2g.descriptors/
org.apache.geronimo.devtools.j2g.jasper/ org.apache.geronimo.devtools.j2g.jasper/META-INF/
org.apache....
Posted by Donald Woods <dw...@apache.org>.
Do these updates need to go into the 1.0.0 code, too?
-Donald
linsun@apache.org wrote:
> Author: linsun
> Date: Thu Oct 25 13:36:49 2007
> New Revision: 588345
>
> URL: http://svn.apache.org/viewvc?rev=588345&view=rev
> Log:
> various updates to eclipse .classpath and .project, manifest.mf to make all the build errors go away in eclipse. (only build error remains is in test folder).
>
> Modified:
> geronimo/devtools/j2g/trunk/plugins/org.apache.geronimo.devtools.j2g.common/.classpath
> geronimo/devtools/j2g/trunk/plugins/org.apache.geronimo.devtools.j2g.common/.project
> geronimo/devtools/j2g/trunk/plugins/org.apache.geronimo.devtools.j2g.descriptors/.classpath
> geronimo/devtools/j2g/trunk/plugins/org.apache.geronimo.devtools.j2g.descriptors/.project
> geronimo/devtools/j2g/trunk/plugins/org.apache.geronimo.devtools.j2g.jasper/.classpath
> geronimo/devtools/j2g/trunk/plugins/org.apache.geronimo.devtools.j2g.jasper/.project
> geronimo/devtools/j2g/trunk/plugins/org.apache.geronimo.devtools.j2g.jasper/META-INF/MANIFEST.MF
> geronimo/devtools/j2g/trunk/plugins/org.apache.geronimo.devtools.j2g.resources/.classpath
> geronimo/devtools/j2g/trunk/plugins/org.apache.geronimo.devtools.j2g.sources/.classpath
> geronimo/devtools/j2g/trunk/plugins/org.apache.geronimo.devtools.j2g.sources/.project
> geronimo/devtools/j2g/trunk/plugins/org.apache.geronimo.devtools.j2g.sources/META-INF/MANIFEST.MF
> geronimo/devtools/j2g/trunk/plugins/org.apache.geronimo.devtools.j2g.ui/.classpath
> geronimo/devtools/j2g/trunk/plugins/org.apache.geronimo.devtools.j2g.ui/.project
> geronimo/devtools/j2g/trunk/plugins/org.apache.geronimo.devtools.j2g.util/.classpath
> geronimo/devtools/j2g/trunk/plugins/org.apache.geronimo.devtools.j2g.util/.project
> geronimo/devtools/j2g/trunk/plugins/org.apache.geronimo.devtools.j2g.util/META-INF/MANIFEST.MF
> geronimo/devtools/j2g/trunk/plugins/org.apache.geronimo.devtools.j2g.util/build.properties
>
> Modified: geronimo/devtools/j2g/trunk/plugins/org.apache.geronimo.devtools.j2g.common/.classpath
> URL: http://svn.apache.org/viewvc/geronimo/devtools/j2g/trunk/plugins/org.apache.geronimo.devtools.j2g.common/.classpath?rev=588345&r1=588344&r2=588345&view=diff
> ==============================================================================
> --- geronimo/devtools/j2g/trunk/plugins/org.apache.geronimo.devtools.j2g.common/.classpath (original)
> +++ geronimo/devtools/j2g/trunk/plugins/org.apache.geronimo.devtools.j2g.common/.classpath Thu Oct 25 13:36:49 2007
> @@ -1,6 +1,7 @@
> <classpath>
> - <classpathentry kind="src" path="." including="plugin.xml" excluding="**/*.java"/>
> + <classpathentry kind="src" path="." including="LICENSE.txt|NOTICE.txt" excluding="**/*.java"/>
> <classpathentry kind="src" path="src"/>
> <classpathentry kind="output" path="target/classes"/>
> <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
> + <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
> </classpath>
>
> Modified: geronimo/devtools/j2g/trunk/plugins/org.apache.geronimo.devtools.j2g.common/.project
> URL: http://svn.apache.org/viewvc/geronimo/devtools/j2g/trunk/plugins/org.apache.geronimo.devtools.j2g.common/.project?rev=588345&r1=588344&r2=588345&view=diff
> ==============================================================================
> --- geronimo/devtools/j2g/trunk/plugins/org.apache.geronimo.devtools.j2g.common/.project (original)
> +++ geronimo/devtools/j2g/trunk/plugins/org.apache.geronimo.devtools.j2g.common/.project Thu Oct 25 13:36:49 2007
> @@ -12,6 +12,15 @@
> <buildCommand>
> <name>org.eclipse.pde.SchemaBuilder</name>
> </buildCommand>
> + <buildCommand>
> + <name>org.eclipse.ui.externaltools.ExternalToolBuilder</name>
> + <arguments>
> + <dictionary>
> + <key>LaunchConfigHandle</key>
> + <value><project>/.externalToolBuilders/Maven_Ant_Builder.launch</value>
> + </dictionary>
> + </arguments>
> + </buildCommand>
> </buildSpec>
> <natures>
> <nature>org.eclipse.pde.PluginNature</nature>
>
> Modified: geronimo/devtools/j2g/trunk/plugins/org.apache.geronimo.devtools.j2g.descriptors/.classpath
> URL: http://svn.apache.org/viewvc/geronimo/devtools/j2g/trunk/plugins/org.apache.geronimo.devtools.j2g.descriptors/.classpath?rev=588345&r1=588344&r2=588345&view=diff
> ==============================================================================
> --- geronimo/devtools/j2g/trunk/plugins/org.apache.geronimo.devtools.j2g.descriptors/.classpath (original)
> +++ geronimo/devtools/j2g/trunk/plugins/org.apache.geronimo.devtools.j2g.descriptors/.classpath Thu Oct 25 13:36:49 2007
> @@ -3,6 +3,6 @@
> <classpathentry kind="src" path="test"/>
> <classpathentry kind="src" path="src"/>
> <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
> - <classpathentry kind="src" path="/org.apache.geronimo.devtools.j2g.common"/>
> + <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
> <classpathentry kind="output" path="target/classes"/>
> </classpath>
>
> Modified: geronimo/devtools/j2g/trunk/plugins/org.apache.geronimo.devtools.j2g.descriptors/.project
> URL: http://svn.apache.org/viewvc/geronimo/devtools/j2g/trunk/plugins/org.apache.geronimo.devtools.j2g.descriptors/.project?rev=588345&r1=588344&r2=588345&view=diff
> ==============================================================================
> --- geronimo/devtools/j2g/trunk/plugins/org.apache.geronimo.devtools.j2g.descriptors/.project (original)
> +++ geronimo/devtools/j2g/trunk/plugins/org.apache.geronimo.devtools.j2g.descriptors/.project Thu Oct 25 13:36:49 2007
> @@ -3,6 +3,7 @@
> <comment>JBoss to Geronimo Conversion Tool</comment>
> <projects>
> <project>org.apache.geronimo.devtools.j2g.common</project>
> + <project>org.apache.geronimo.devtools.j2g.util</project>
> </projects>
> <buildSpec>
> <buildCommand>
>
> Modified: geronimo/devtools/j2g/trunk/plugins/org.apache.geronimo.devtools.j2g.jasper/.classpath
> URL: http://svn.apache.org/viewvc/geronimo/devtools/j2g/trunk/plugins/org.apache.geronimo.devtools.j2g.jasper/.classpath?rev=588345&r1=588344&r2=588345&view=diff
> ==============================================================================
> --- geronimo/devtools/j2g/trunk/plugins/org.apache.geronimo.devtools.j2g.jasper/.classpath (original)
> +++ geronimo/devtools/j2g/trunk/plugins/org.apache.geronimo.devtools.j2g.jasper/.classpath Thu Oct 25 13:36:49 2007
> @@ -4,18 +4,12 @@
> <classpathentry kind="src" path="src"/>
> <classpathentry kind="output" path="target/classes"/>
> <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
> - <classpathentry kind="var" path="M2_REPO/avalon-framework/avalon-framework/4.1.3/avalon-framework-4.1.3.jar"/>
> - <classpathentry kind="var" path="M2_REPO/org/apache/geronimo/specs/geronimo-jsp_2.0_spec/1.1/geronimo-jsp_2.0_spec-1.1.jar"/>
> - <classpathentry kind="var" path="M2_REPO/tomcat/jasper-compiler/5.5.15/jasper-compiler-5.5.15.jar"/>
> - <classpathentry kind="var" path="M2_REPO/log4j/log4j/1.2.12/log4j-1.2.12.jar"/>
> - <classpathentry kind="var" path="M2_REPO/tomcat/jasper-runtime/5.5.15/jasper-runtime-5.5.15.jar"/>
> - <classpathentry kind="var" path="M2_REPO/javax/servlet/servlet-api/2.3/servlet-api-2.3.jar"/>
> - <classpathentry kind="var" path="M2_REPO/logkit/logkit/1.0.1/logkit-1.0.1.jar"/>
> - <classpathentry kind="var" path="M2_REPO/commons-logging/commons-logging/1.1/commons-logging-1.1.jar"/>
> - <classpathentry kind="var" path="M2_REPO/tomcat/jasper-compiler-jdt/5.5.15/jasper-compiler-jdt-5.5.15.jar"/>
> - <classpathentry kind="var" path="M2_REPO/ant/ant/1.6.5/ant-1.6.5.jar"/>
> - <classpathentry kind="var" path="M2_REPO/commons-el/commons-el/1.0/commons-el-1.0.jar"/>
> - <classpathentry kind="src" path="/org.apache.geronimo.devtools.j2g.common"/>
> - <classpathentry kind="var" path="M2_REPO/javax/servlet/jsp-api/2.0/jsp-api-2.0.jar"/>
> - <classpathentry kind="var" path="M2_REPO/org/apache/geronimo/specs/geronimo-servlet_2.4_spec/1.1.1/geronimo-servlet_2.4_spec-1.1.1.jar"/>
> + <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
> + <classpathentry exported="true" kind="lib" path="lib/geronimo-jsp_2.0_spec-1.1.jar"/>
> + <classpathentry exported="true" kind="lib" path="lib/jasper-compiler-5.5.15.jar"/>
> + <classpathentry exported="true" kind="lib" path="lib/jasper-runtime-5.5.15.jar"/>
> + <classpathentry exported="true" kind="lib" path="lib/commons-logging-1.1.jar"/>
> + <classpathentry exported="true" kind="lib" path="lib/jasper-compiler-jdt-5.5.15.jar"/>
> + <classpathentry exported="true" kind="lib" path="lib/commons-el-1.0.jar"/>
> + <classpathentry exported="true" kind="lib" path="lib/geronimo-servlet_2.4_spec-1.1.1.jar"/>
> </classpath>
>
> Modified: geronimo/devtools/j2g/trunk/plugins/org.apache.geronimo.devtools.j2g.jasper/.project
> URL: http://svn.apache.org/viewvc/geronimo/devtools/j2g/trunk/plugins/org.apache.geronimo.devtools.j2g.jasper/.project?rev=588345&r1=588344&r2=588345&view=diff
> ==============================================================================
> --- geronimo/devtools/j2g/trunk/plugins/org.apache.geronimo.devtools.j2g.jasper/.project (original)
> +++ geronimo/devtools/j2g/trunk/plugins/org.apache.geronimo.devtools.j2g.jasper/.project Thu Oct 25 13:36:49 2007
> @@ -14,15 +14,6 @@
> <buildCommand>
> <name>org.eclipse.pde.SchemaBuilder</name>
> </buildCommand>
> - <buildCommand>
> - <name>org.eclipse.ui.externaltools.ExternalToolBuilder</name>
> - <arguments>
> - <dictionary>
> - <key>LaunchConfigHandle</key>
> - <value><project>/.externalToolBuilders/Maven_Ant_Builder.launch</value>
> - </dictionary>
> - </arguments>
> - </buildCommand>
> </buildSpec>
> <natures>
> <nature>org.eclipse.pde.PluginNature</nature>
>
> Modified: geronimo/devtools/j2g/trunk/plugins/org.apache.geronimo.devtools.j2g.jasper/META-INF/MANIFEST.MF
> URL: http://svn.apache.org/viewvc/geronimo/devtools/j2g/trunk/plugins/org.apache.geronimo.devtools.j2g.jasper/META-INF/MANIFEST.MF?rev=588345&r1=588344&r2=588345&view=diff
> ==============================================================================
> --- geronimo/devtools/j2g/trunk/plugins/org.apache.geronimo.devtools.j2g.jasper/META-INF/MANIFEST.MF (original)
> +++ geronimo/devtools/j2g/trunk/plugins/org.apache.geronimo.devtools.j2g.jasper/META-INF/MANIFEST.MF Thu Oct 25 13:36:49 2007
> @@ -4,7 +4,7 @@
> Bundle-SymbolicName: org.apache.geronimo.devtools.j2g.jasper;singleton:=true
> Bundle-Version: 1.1.0
> Bundle-Vendor: Apache.org
> -Bundle-ClassPath: .,
> +Bundle-ClassPath:
> lib/commons-el-1.0.jar,
> lib/commons-logging-1.1.jar,
> lib/geronimo-jsp_2.0_spec-1.1.jar,
>
> Modified: geronimo/devtools/j2g/trunk/plugins/org.apache.geronimo.devtools.j2g.resources/.classpath
> URL: http://svn.apache.org/viewvc/geronimo/devtools/j2g/trunk/plugins/org.apache.geronimo.devtools.j2g.resources/.classpath?rev=588345&r1=588344&r2=588345&view=diff
> ==============================================================================
> --- geronimo/devtools/j2g/trunk/plugins/org.apache.geronimo.devtools.j2g.resources/.classpath (original)
> +++ geronimo/devtools/j2g/trunk/plugins/org.apache.geronimo.devtools.j2g.resources/.classpath Thu Oct 25 13:36:49 2007
> @@ -3,6 +3,6 @@
> <classpathentry kind="src" path="test"/>
> <classpathentry kind="src" path="src"/>
> <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
> - <classpathentry kind="src" path="/org.apache.geronimo.devtools.j2g.common"/>
> + <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
> <classpathentry kind="output" path="target/classes"/>
> </classpath>
>
> Modified: geronimo/devtools/j2g/trunk/plugins/org.apache.geronimo.devtools.j2g.sources/.classpath
> URL: http://svn.apache.org/viewvc/geronimo/devtools/j2g/trunk/plugins/org.apache.geronimo.devtools.j2g.sources/.classpath?rev=588345&r1=588344&r2=588345&view=diff
> ==============================================================================
> --- geronimo/devtools/j2g/trunk/plugins/org.apache.geronimo.devtools.j2g.sources/.classpath (original)
> +++ geronimo/devtools/j2g/trunk/plugins/org.apache.geronimo.devtools.j2g.sources/.classpath Thu Oct 25 13:36:49 2007
> @@ -1,22 +1,7 @@
> <classpath>
> <classpathentry kind="src" path="." including="plugin.xml" excluding="**/*.java"/>
> - <classpathentry kind="src" path="src"/>
> + <classpathentry kind="src" path="src"/>
> <classpathentry kind="output" path="target/classes"/>
> <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
> - <classpathentry kind="var" path="M2_REPO/tomcat/jasper-compiler/5.5.15/jasper-compiler-5.5.15.jar"/>
> - <classpathentry kind="var" path="M2_REPO/log4j/log4j/1.2.12/log4j-1.2.12.jar"/>
> - <classpathentry kind="src" path="/org.apache.geronimo.j2g.jasper"/>
> - <classpathentry kind="var" path="M2_REPO/commons-el/commons-el/1.0/commons-el-1.0.jar"/>
> - <classpathentry kind="var" path="M2_REPO/org/apache/geronimo/specs/geronimo-jsp_2.0_spec/1.1/geronimo-jsp_2.0_spec-1.1.jar"/>
> - <classpathentry kind="var" path="M2_REPO/logkit/logkit/1.0.1/logkit-1.0.1.jar"/>
> - <classpathentry kind="var" path="M2_REPO/org/eclipse/jdt/core/3.2.0.666/core-3.2.0.666.jar"/>
> - <classpathentry kind="var" path="M2_REPO/org/apache/geronimo/specs/geronimo-servlet_2.4_spec/1.1.1/geronimo-servlet_2.4_spec-1.1.1.jar"/>
> - <classpathentry kind="var" path="M2_REPO/avalon-framework/avalon-framework/4.1.3/avalon-framework-4.1.3.jar"/>
> - <classpathentry kind="src" path="/org.apache.geronimo.j2g.common"/>
> - <classpathentry kind="var" path="M2_REPO/tomcat/jasper-runtime/5.5.15/jasper-runtime-5.5.15.jar"/>
> - <classpathentry kind="var" path="M2_REPO/ant/ant/1.6.5/ant-1.6.5.jar"/>
> - <classpathentry kind="var" path="M2_REPO/javax/servlet/servlet-api/2.3/servlet-api-2.3.jar"/>
> - <classpathentry kind="var" path="M2_REPO/javax/servlet/jsp-api/2.0/jsp-api-2.0.jar"/>
> - <classpathentry kind="var" path="M2_REPO/tomcat/jasper-compiler-jdt/5.5.15/jasper-compiler-jdt-5.5.15.jar"/>
> - <classpathentry kind="var" path="M2_REPO/commons-logging/commons-logging/1.1/commons-logging-1.1.jar"/>
> + <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
> </classpath>
>
> Modified: geronimo/devtools/j2g/trunk/plugins/org.apache.geronimo.devtools.j2g.sources/.project
> URL: http://svn.apache.org/viewvc/geronimo/devtools/j2g/trunk/plugins/org.apache.geronimo.devtools.j2g.sources/.project?rev=588345&r1=588344&r2=588345&view=diff
> ==============================================================================
> --- geronimo/devtools/j2g/trunk/plugins/org.apache.geronimo.devtools.j2g.sources/.project (original)
> +++ geronimo/devtools/j2g/trunk/plugins/org.apache.geronimo.devtools.j2g.sources/.project Thu Oct 25 13:36:49 2007
> @@ -3,6 +3,7 @@
> <comment>JBoss to Geronimo Conversion Tool</comment>
> <projects>
> <project>org.apache.geronimo.devtools.j2g.jasper</project>
> + <project>org.apache.geronimo.devtools.j2g.util</project>
> <project>org.apache.geronimo.devtools.j2g.common</project>
> </projects>
> <buildSpec>
> @@ -20,4 +21,4 @@
> <nature>org.eclipse.pde.PluginNature</nature>
> <nature>org.eclipse.jdt.core.javanature</nature>
> </natures>
> -</projectDescription>
> +</projectDescription>
> \ No newline at end of file
>
> Modified: geronimo/devtools/j2g/trunk/plugins/org.apache.geronimo.devtools.j2g.sources/META-INF/MANIFEST.MF
> URL: http://svn.apache.org/viewvc/geronimo/devtools/j2g/trunk/plugins/org.apache.geronimo.devtools.j2g.sources/META-INF/MANIFEST.MF?rev=588345&r1=588344&r2=588345&view=diff
> ==============================================================================
> --- geronimo/devtools/j2g/trunk/plugins/org.apache.geronimo.devtools.j2g.sources/META-INF/MANIFEST.MF (original)
> +++ geronimo/devtools/j2g/trunk/plugins/org.apache.geronimo.devtools.j2g.sources/META-INF/MANIFEST.MF Thu Oct 25 13:36:49 2007
> @@ -4,9 +4,9 @@
> Bundle-SymbolicName: org.apache.geronimo.devtools.j2g.sources;singleton:=true
> Bundle-Version: 1.1.0
> Bundle-Localization: plugin
> -Require-Bundle: org.apache.geronimo.devtools.j2g.common,
> +Require-Bundle: org.apache.geronimo.devtools.j2g.util,
> + org.apache.geronimo.devtools.j2g.common,
> org.apache.geronimo.devtools.j2g.jasper,
> - org.apache.geronimo.devtools.j2g.util,
> org.eclipse.core.resources,
> org.eclipse.core.runtime,
> org.eclipse.jdt,
> @@ -19,5 +19,4 @@
> lib/geronimo-util-1.1.jar
> Export-Package: org.apache.geronimo.devtools.j2g.sources,
> org.apache.geronimo.devtools.j2g.sources.dependence,
> - org.apache.geronimo.devtools.j2g.sources.dependence.compatibility,
> org.apache.geronimo.devtools.j2g.sources.environment
>
> Modified: geronimo/devtools/j2g/trunk/plugins/org.apache.geronimo.devtools.j2g.ui/.classpath
> URL: http://svn.apache.org/viewvc/geronimo/devtools/j2g/trunk/plugins/org.apache.geronimo.devtools.j2g.ui/.classpath?rev=588345&r1=588344&r2=588345&view=diff
> ==============================================================================
> --- geronimo/devtools/j2g/trunk/plugins/org.apache.geronimo.devtools.j2g.ui/.classpath (original)
> +++ geronimo/devtools/j2g/trunk/plugins/org.apache.geronimo.devtools.j2g.ui/.classpath Thu Oct 25 13:36:49 2007
> @@ -1,9 +1,7 @@
> <?xml version="1.0" encoding="UTF-8"?>
> <classpath>
> - <classpathentry excluding="**/*.java" including="plugin.xml" kind="src" path=""/>
> - <classpathentry excluding="**/*.java" including="*.jar" kind="src" path="lib"/>
> <classpathentry kind="src" path="src"/>
> - <classpathentry kind="src" output="target/test-classes" path="test"/>
> <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
> + <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
> <classpathentry kind="output" path="target/classes"/>
> </classpath>
>
> Modified: geronimo/devtools/j2g/trunk/plugins/org.apache.geronimo.devtools.j2g.ui/.project
> URL: http://svn.apache.org/viewvc/geronimo/devtools/j2g/trunk/plugins/org.apache.geronimo.devtools.j2g.ui/.project?rev=588345&r1=588344&r2=588345&view=diff
> ==============================================================================
> --- geronimo/devtools/j2g/trunk/plugins/org.apache.geronimo.devtools.j2g.ui/.project (original)
> +++ geronimo/devtools/j2g/trunk/plugins/org.apache.geronimo.devtools.j2g.ui/.project Thu Oct 25 13:36:49 2007
> @@ -20,15 +20,6 @@
> <arguments>
> </arguments>
> </buildCommand>
> - <buildCommand>
> - <name>org.eclipse.ui.externaltools.ExternalToolBuilder</name>
> - <arguments>
> - <dictionary>
> - <key>LaunchConfigHandle</key>
> - <value><project>/.externalToolBuilders/Maven_Ant_Builder.launch</value>
> - </dictionary>
> - </arguments>
> - </buildCommand>
> </buildSpec>
> <natures>
> <nature>org.eclipse.jdt.core.javanature</nature>
>
> Modified: geronimo/devtools/j2g/trunk/plugins/org.apache.geronimo.devtools.j2g.util/.classpath
> URL: http://svn.apache.org/viewvc/geronimo/devtools/j2g/trunk/plugins/org.apache.geronimo.devtools.j2g.util/.classpath?rev=588345&r1=588344&r2=588345&view=diff
> ==============================================================================
> --- geronimo/devtools/j2g/trunk/plugins/org.apache.geronimo.devtools.j2g.util/.classpath (original)
> +++ geronimo/devtools/j2g/trunk/plugins/org.apache.geronimo.devtools.j2g.util/.classpath Thu Oct 25 13:36:49 2007
> @@ -1,24 +1,14 @@
> +<?xml version="1.0" encoding="UTF-8"?>
> <classpath>
> - <classpathentry kind="src" path="." including="plugin.xml" excluding="**/*.java"/>
> - <classpathentry kind="src" path="lib" including="*.jar" excluding="**/*.java"/>
> - <classpathentry kind="src" path="src"/>
> - <classpathentry kind="src" path="test" output="target/test-classes"/>
> - <classpathentry kind="output" path="target/classes"/>
> - <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
> - <classpathentry kind="var" path="M2_REPO/pull-parser/pull-parser/2.1.10/pull-parser-2.1.10.jar"/>
> - <classpathentry kind="var" path="M2_REPO/commons-logging/commons-logging/1.1/commons-logging-1.1.jar"/>
> - <classpathentry kind="var" path="M2_REPO/jdom/jdom/1.0/jdom-1.0.jar"/>
> - <classpathentry kind="var" path="M2_REPO/junit/junit/4.3.1/junit-4.3.1.jar"/>
> - <classpathentry kind="var" path="M2_REPO/javax/servlet/servlet-api/2.3/servlet-api-2.3.jar"/>
> - <classpathentry kind="var" path="M2_REPO/xerces/xmlParserAPIs/2.6.2/xmlParserAPIs-2.6.2.jar"/>
> - <classpathentry kind="var" path="M2_REPO/dom4j/dom4j/1.6.1/dom4j-1.6.1.jar"/>
> - <classpathentry kind="var" path="M2_REPO/log4j/log4j/1.2.12/log4j-1.2.12.jar"/>
> - <classpathentry kind="var" path="M2_REPO/logkit/logkit/1.0.1/logkit-1.0.1.jar"/>
> - <classpathentry kind="var" path="M2_REPO/xerces/xercesImpl/2.6.2/xercesImpl-2.6.2.jar"/>
> - <classpathentry kind="var" path="M2_REPO/avalon-framework/avalon-framework/4.1.3/avalon-framework-4.1.3.jar"/>
> - <classpathentry kind="var" path="M2_REPO/com/ibm/icu/icu4j/2.6.1/icu4j-2.6.1.jar"/>
> - <classpathentry kind="var" path="M2_REPO/xom/xom/1.0/xom-1.0.jar"/>
> - <classpathentry kind="var" path="M2_REPO/xalan/xalan/2.6.0/xalan-2.6.0.jar"/>
> - <classpathentry kind="var" path="M2_REPO/xml-apis/xml-apis/1.0.b2/xml-apis-1.0.b2.jar"/>
> - <classpathentry kind="var" path="M2_REPO/jaxen/jaxen/1.1/jaxen-1.1.jar"/>
> -</classpath>
> \ No newline at end of file
> + <classpathentry excluding="**/*.java" including="plugin.xml" kind="src" path=""/>
> + <classpathentry excluding="**/*.java" including="*.jar" kind="src" path="lib"/>
> + <classpathentry kind="src" path="src"/>
> + <classpathentry kind="src" output="target/test-classes" path="test"/>
> + <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
> + <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
> + <classpathentry exported="true" kind="lib" path="lib/pull-parser-2.1.10.jar"/>
> + <classpathentry exported="true" kind="lib" path="lib/commons-logging-1.1.jar"/>
> + <classpathentry exported="true" kind="lib" path="lib/dom4j-1.6.1.jar"/>
> + <classpathentry exported="true" kind="lib" path="lib/jaxen-1.1.jar"/>
> + <classpathentry kind="output" path="target/classes"/>
> +</classpath>
>
> Modified: geronimo/devtools/j2g/trunk/plugins/org.apache.geronimo.devtools.j2g.util/.project
> URL: http://svn.apache.org/viewvc/geronimo/devtools/j2g/trunk/plugins/org.apache.geronimo.devtools.j2g.util/.project?rev=588345&r1=588344&r2=588345&view=diff
> ==============================================================================
> --- geronimo/devtools/j2g/trunk/plugins/org.apache.geronimo.devtools.j2g.util/.project (original)
> +++ geronimo/devtools/j2g/trunk/plugins/org.apache.geronimo.devtools.j2g.util/.project Thu Oct 25 13:36:49 2007
> @@ -12,15 +12,6 @@
> <buildCommand>
> <name>org.eclipse.pde.SchemaBuilder</name>
> </buildCommand>
> - <buildCommand>
> - <name>org.eclipse.ui.externaltools.ExternalToolBuilder</name>
> - <arguments>
> - <dictionary>
> - <key>LaunchConfigHandle</key>
> - <value><project>/.externalToolBuilders/Maven_Ant_Builder.launch</value>
> - </dictionary>
> - </arguments>
> - </buildCommand>
> </buildSpec>
> <natures>
> <nature>org.eclipse.pde.PluginNature</nature>
>
> Modified: geronimo/devtools/j2g/trunk/plugins/org.apache.geronimo.devtools.j2g.util/META-INF/MANIFEST.MF
> URL: http://svn.apache.org/viewvc/geronimo/devtools/j2g/trunk/plugins/org.apache.geronimo.devtools.j2g.util/META-INF/MANIFEST.MF?rev=588345&r1=588344&r2=588345&view=diff
> ==============================================================================
> --- geronimo/devtools/j2g/trunk/plugins/org.apache.geronimo.devtools.j2g.util/META-INF/MANIFEST.MF (original)
> +++ geronimo/devtools/j2g/trunk/plugins/org.apache.geronimo.devtools.j2g.util/META-INF/MANIFEST.MF Thu Oct 25 13:36:49 2007
> @@ -5,17 +5,12 @@
> Bundle-Version: 1.1.0
> Bundle-Vendor: Apache.org
> Require-Bundle: org.eclipse.core.runtime
> -Bundle-ClassPath: .,
> +Bundle-ClassPath:
> lib/commons-logging-1.1.jar,
> lib/dom4j-1.6.1.jar,
> lib/jaxen-1.1.jar,
> - lib/junit-4.3.1.jar,
> lib/pull-parser-2.1.10.jar
> Export-Package:
> - junit.extensions,
> - junit.framework,
> - junit.runner,
> - junit.textui,
> org.apache.commons.logging,
> org.apache.commons.logging.impl,
> org.apache.geronimo.devtools.j2g.util.descriptors,
> @@ -63,13 +58,5 @@
> org.jaxen.saxpath.helpers,
> org.jaxen.util,
> org.jaxen.xom,
> - org.junit,
> - org.junit.internal,
> - org.junit.internal.requests,
> - org.junit.internal.runners,
> - org.junit.runner,
> - org.junit.runner.manipulation,
> - org.junit.runner.notification,
> - org.junit.runners,
> org.w3c.dom
>
>
> Modified: geronimo/devtools/j2g/trunk/plugins/org.apache.geronimo.devtools.j2g.util/build.properties
> URL: http://svn.apache.org/viewvc/geronimo/devtools/j2g/trunk/plugins/org.apache.geronimo.devtools.j2g.util/build.properties?rev=588345&r1=588344&r2=588345&view=diff
> ==============================================================================
> --- geronimo/devtools/j2g/trunk/plugins/org.apache.geronimo.devtools.j2g.util/build.properties (original)
> +++ geronimo/devtools/j2g/trunk/plugins/org.apache.geronimo.devtools.j2g.util/build.properties Thu Oct 25 13:36:49 2007
> @@ -20,10 +20,6 @@
> META-INF/,\
> .,\
> lib/dom4j-1.6.1.jar,\
> - lib/jaxen-1.1-beta-6.jar,\
> - lib/junit-3.8.1.jar,\
> - lib/pull-parser-2.1.10.jar,\
> - lib/commons-logging-api-1.1.jar,\
> - lib/commons-logging-1.1.jar,\
> lib/jaxen-1.1.jar,\
> - lib/junit-4.3.1.jar
> + lib/pull-parser-2.1.10.jar,\
> + lib/commons-logging-1.1.jar
>
>
>