You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by sp...@apache.org on 2006/03/12 14:49:20 UTC
svn commit: r385285 - in /geronimo/devtools/eclipse-plugin/trunk:
geronimo-emf/ maven-plugins/maven-emf-plugin/
maven-plugins/maven-emf-plugin/src/main/java/org/apache/emf/plugin/
maven-plugins/maven-geronimodevtools-plugin/src/main/java/org/apache/ger...
Author: sppatel
Date: Sun Mar 12 05:49:20 2006
New Revision: 385285
URL: http://svn.apache.org/viewcvs?rev=385285&view=rev
Log:
m2 - generating .genmodels and .ecore
Modified:
geronimo/devtools/eclipse-plugin/trunk/geronimo-emf/.classpath
geronimo/devtools/eclipse-plugin/trunk/geronimo-emf/pom.xml
geronimo/devtools/eclipse-plugin/trunk/maven-plugins/maven-emf-plugin/pom.xml
geronimo/devtools/eclipse-plugin/trunk/maven-plugins/maven-emf-plugin/src/main/java/org/apache/emf/plugin/LaunchOSGIMojo.java
geronimo/devtools/eclipse-plugin/trunk/maven-plugins/maven-emf-plugin/src/main/java/org/apache/emf/plugin/XSDImporterMojo.java
geronimo/devtools/eclipse-plugin/trunk/maven-plugins/maven-geronimodevtools-plugin/src/main/java/org/apache/geronimo/eclipse/devtools/InstallPluginDependenciesMojo.java
geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.deployment.model/pom.xml
Modified: geronimo/devtools/eclipse-plugin/trunk/geronimo-emf/.classpath
URL: http://svn.apache.org/viewcvs/geronimo/devtools/eclipse-plugin/trunk/geronimo-emf/.classpath?rev=385285&r1=385284&r2=385285&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/geronimo-emf/.classpath (original)
+++ geronimo/devtools/eclipse-plugin/trunk/geronimo-emf/.classpath Sun Mar 12 05:49:20 2006
@@ -1,7 +1,66 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
- <classpathentry kind="src" path="src"/>
- <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>
+<classpath>
+ <classpathentry kind="src" path="." output="genmodels"/>
+ <classpathentry kind="output" path="target/classes"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+ <classpathentry kind="var" path="M2_REPO/org/apache/geronimo/specs/geronimo-jaxrpc_1.1_spec/1.0/geronimo-jaxrpc_1.1_spec-1.0.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/apache/geronimo/specs/geronimo-j2ee-jacc_1.0_spec/1.0/geronimo-j2ee-jacc_1.0_spec-1.0.jar"/>
+ <classpathentry kind="var" path="M2_REPO/commons-logging/commons-logging/1.0.4/commons-logging-1.0.4.jar"/>
+ <classpathentry kind="var" path="M2_REPO/geronimo-spec/geronimo-spec-jta/1.0.1B-rc4/geronimo-spec-jta-1.0.1B-rc4.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/apache/geronimo/specs/geronimo-j2ee-connector_1.5_spec/1.0/geronimo-j2ee-connector_1.5_spec-1.0.jar"/>
+ <classpathentry kind="var" path="M2_REPO/geronimo/geronimo-j2ee-schema/1.0/geronimo-j2ee-schema-1.0.jar"/>
+ <classpathentry kind="var" path="M2_REPO/hsqldb/hsqldb/1.7.2.2/hsqldb-1.7.2.2.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/apache/geronimo/specs/geronimo-j2ee-deployment_1.1_spec/1.0/geronimo-j2ee-deployment_1.1_spec-1.0.jar"/>
+ <classpathentry kind="var" path="M2_REPO/geronimo/geronimo-common/1.0/geronimo-common-1.0.jar"/>
+ <classpathentry kind="var" path="M2_REPO/mx4j/mx4j/3.0.1/mx4j-3.0.1.jar"/>
+ <classpathentry kind="var" path="M2_REPO/regexp/regexp/1.3/regexp-1.3.jar"/>
+ <classpathentry kind="var" path="M2_REPO/geronimo/geronimo-core/1.0/geronimo-core-1.0.jar"/>
+ <classpathentry kind="var" path="M2_REPO/velocity/velocity-dep/1.4/velocity-dep-1.4.jar"/>
+ <classpathentry kind="var" path="M2_REPO/geronimo/geronimo-client-builder/1.0/geronimo-client-builder-1.0.jar"/>
+ <classpathentry kind="var" path="M2_REPO/geronimo/geronimo-transaction/1.0/geronimo-transaction-1.0.jar"/>
+ <classpathentry kind="var" path="M2_REPO/xmlbeans/xbean/2.0.0/xbean-2.0.0.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/apache/geronimo/specs/geronimo-j2ee-management_1.0_spec/1.0/geronimo-j2ee-management_1.0_spec-1.0.jar"/>
+ <classpathentry kind="var" path="M2_REPO/xml-resolver/xml-resolver/1.1/xml-resolver-1.1.jar"/>
+ <classpathentry kind="var" path="M2_REPO/geronimo/geronimo-web-builder/1.0/geronimo-web-builder-1.0.jar"/>
+ <classpathentry kind="var" path="M2_REPO/geronimo/geronimo-deploy-config/1.0/geronimo-deploy-config-1.0.jar"/>
+ <classpathentry kind="var" path="M2_REPO/geronimo/geronimo-kernel/1.0/geronimo-kernel-1.0.jar"/>
+ <classpathentry kind="var" path="M2_REPO/velocity/velocity/1.4/velocity-1.4.jar"/>
+ <classpathentry kind="var" path="M2_REPO/commons-primitives/commons-primitives/1.0/commons-primitives-1.0.jar"/>
+ <classpathentry kind="var" path="M2_REPO/stax/stax-api/1.0/stax-api-1.0.jar"/>
+ <classpathentry kind="var" path="M2_REPO/activeio/activeio/2.0-r118/activeio-2.0-r118.jar"/>
+ <classpathentry kind="var" path="M2_REPO/geronimo/geronimo-util/1.0/geronimo-util-1.0.jar"/>
+ <classpathentry kind="var" path="M2_REPO/openejb/openejb-pkgen-builder/2.0/openejb-pkgen-builder-2.0.jar"/>
+ <classpathentry kind="var" path="M2_REPO/commons-jelly/commons-jelly-tags-velocity/1.0/commons-jelly-tags-velocity-1.0.jar"/>
+ <classpathentry kind="var" path="M2_REPO/geronimo-spec/geronimo-spec-ejb/2.1-rc4/geronimo-spec-ejb-2.1-rc4.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/apache/geronimo/specs/geronimo-activation_1.0.2_spec/1.0/geronimo-activation_1.0.2_spec-1.0.jar"/>
+ <classpathentry kind="var" path="M2_REPO/geronimo/geronimo-security/1.0/geronimo-security-1.0.jar"/>
+ <classpathentry kind="var" path="M2_REPO/geronimo/geronimo-system/1.0/geronimo-system-1.0.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/apache/geronimo/specs/geronimo-qname_1.1_spec/1.0/geronimo-qname_1.1_spec-1.0.jar"/>
+ <classpathentry kind="var" path="M2_REPO/antlr/antlr/2.7.2/antlr-2.7.2.jar"/>
+ <classpathentry kind="var" path="M2_REPO/javacc/javacc/3.2/javacc-3.2.jar"/>
+ <classpathentry kind="var" path="M2_REPO/concurrent/concurrent/1.3.4/concurrent-1.3.4.jar"/>
+ <classpathentry kind="var" path="M2_REPO/geronimo/geronimo-test-ddbean/1.0/geronimo-test-ddbean-1.0.jar"/>
+ <classpathentry kind="var" path="M2_REPO/junit/junit/3.8.1/junit-3.8.1.jar"/>
+ <classpathentry kind="var" path="M2_REPO/geronimo/geronimo-naming-builder/1.0/geronimo-naming-builder-1.0.jar"/>
+ <classpathentry kind="var" path="M2_REPO/log4j/log4j/1.2.8/log4j-1.2.8.jar"/>
+ <classpathentry kind="var" path="M2_REPO/commons-collections/commons-collections/2.1/commons-collections-2.1.jar"/>
+ <classpathentry kind="var" path="M2_REPO/geronimo/geronimo-management/1.0/geronimo-management-1.0.jar"/>
+ <classpathentry kind="var" path="M2_REPO/tranql/tranql/1.2.1/tranql-1.2.1.jar"/>
+ <classpathentry kind="var" path="M2_REPO/openejb/openejb-builder/2.0/openejb-builder-2.0.jar"/>
+ <classpathentry kind="var" path="M2_REPO/geronimo/geronimo-j2ee/1.0/geronimo-j2ee-1.0.jar"/>
+ <classpathentry kind="var" path="M2_REPO/geronimo/geronimo-j2ee-builder/1.0/geronimo-j2ee-builder-1.0.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/apache/geronimo/specs/geronimo-jta_1.0.1B_spec/1.0/geronimo-jta_1.0.1B_spec-1.0.jar"/>
+ <classpathentry kind="var" path="M2_REPO/geronimo/geronimo-connector/1.0/geronimo-connector-1.0.jar"/>
+ <classpathentry kind="var" path="M2_REPO/geronimo/geronimo-connector-builder/1.0/geronimo-connector-builder-1.0.jar"/>
+ <classpathentry kind="var" path="M2_REPO/commons-codec/commons-codec/1.2/commons-codec-1.2.jar"/>
+ <classpathentry kind="var" path="M2_REPO/howl/howl-logger/0.1.11/howl-logger-0.1.11.jar"/>
+ <classpathentry kind="var" path="M2_REPO/geronimo/geronimo-deployment/1.0/geronimo-deployment-1.0.jar"/>
+ <classpathentry kind="var" path="M2_REPO/axion/axion/1.0-M3-dev/axion-1.0-M3-dev.jar"/>
+ <classpathentry kind="var" path="M2_REPO/cglib/cglib-nodep/2.1_3/cglib-nodep-2.1_3.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/apache/geronimo/specs/geronimo-servlet_2.4_spec/1.0/geronimo-servlet_2.4_spec-1.0.jar"/>
+ <classpathentry kind="var" path="M2_REPO/geronimo/geronimo-client/1.0/geronimo-client-1.0.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/apache/geronimo/specs/geronimo-saaj_1.1_spec/1.0/geronimo-saaj_1.1_spec-1.0.jar"/>
+ <classpathentry kind="var" path="M2_REPO/geronimo/geronimo-naming/1.0/geronimo-naming-1.0.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/apache/geronimo/specs/geronimo-ejb_2.1_spec/1.0/geronimo-ejb_2.1_spec-1.0.jar"/>
+ <classpathentry kind="var" path="M2_REPO/geronimo/geronimo-service-builder/1.0/geronimo-service-builder-1.0.jar"/>
+ <classpathentry kind="var" path="M2_REPO/geronimo/geronimo-security-builder/1.0/geronimo-security-builder-1.0.jar"/>
+</classpath>
\ No newline at end of file
Modified: geronimo/devtools/eclipse-plugin/trunk/geronimo-emf/pom.xml
URL: http://svn.apache.org/viewcvs/geronimo/devtools/eclipse-plugin/trunk/geronimo-emf/pom.xml?rev=385285&r1=385284&r2=385285&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/geronimo-emf/pom.xml (original)
+++ geronimo/devtools/eclipse-plugin/trunk/geronimo-emf/pom.xml Sun Mar 12 05:49:20 2006
@@ -10,29 +10,12 @@
<version>1.0</version>
</parent>
<build>
- <resources>
- <resource>
- <targetPath>genmodels</targetPath>
- <directory>genmodels</directory>
- <includes>
- <include>**/*.genmodel</include>
- </includes>
- </resource>
- <!-- TODO REMOVE THIS ENTRY-->
- <resource>
- <targetPath>genmodels</targetPath>
- <directory>.</directory>
- <includes>
- <include>*.genmodel</include>
- </includes>
- </resource>
- </resources>
<plugins>
<plugin>
<groupId>org.apache.geronimo.devtools</groupId>
<artifactId>maven-geronimodevtools-plugin</artifactId>
<configuration>
- <target>${project.build.directory}/classes/schemas</target>
+ <target>${project.build.directory}/schemas</target>
<includes>
<include>**/*.xsd</include>
</includes>
@@ -43,6 +26,44 @@
<goals>
<goal>importresources</goal>
</goals>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.geronimo.devtools</groupId>
+ <artifactId>maven-emf-plugin</artifactId>
+ <configuration>
+ <workspace>${project.build.directory}/workspace</workspace>
+ <modelProject>${project.build.directory}/org.apache.geronimo.deployment.model</modelProject>
+ <editProject>${project.build.directory}/org.apache.geronimo.deployment.model.edit</editProject>
+ <src>src</src>
+ <reload>true</reload>
+ </configuration>
+ <executions>
+ <execution>
+ <id>execution-web</id>
+ <phase>generate-resources</phase>
+ <goals>
+ <goal>xsd2genmodel</goal>
+ </goals>
+ <configuration>
+ <schemas>
+ <schema>${project.build.directory}/schemas/geronimo-web-1.0.xsd</schema>
+ </schemas>
+ <genmodel>${project.build.outputDirectory}/emf/geronimo-web.genmodel</genmodel>
+ <packages>
+ <package>http://geronimo.apache.org/xml/ns/naming-1.0</package>
+ <package>http://geronimo.apache.org/xml/ns/security-1.1</package>
+ <package>http://geronimo.apache.org/xml/ns/deployment-1.0</package>
+ <package>http://geronimo.apache.org/xml/ns/j2ee/web-1.0</package>
+ </packages>
+ <packagemap>
+ <org.apache.geronimo.xml.ns.naming>http://geronimo.apache.org/xml/ns/naming-1.0</org.apache.geronimo.xml.ns.naming>
+ <org.apache.geronimo.xml.ns.security>http://geronimo.apache.org/xml/ns/security-1.1</org.apache.geronimo.xml.ns.security>
+ <org.apache.geronimo.xml.ns.deployment>http://geronimo.apache.org/xml/ns/deployment-1.0</org.apache.geronimo.xml.ns.deployment>
+ <org.apache.geronimo.xml.ns.j2ee.web>http://geronimo.apache.org/xml/ns/j2ee/web-1.0</org.apache.geronimo.xml.ns.j2ee.web>
+ </packagemap>
+ </configuration>
</execution>
</executions>
</plugin>
Modified: geronimo/devtools/eclipse-plugin/trunk/maven-plugins/maven-emf-plugin/pom.xml
URL: http://svn.apache.org/viewcvs/geronimo/devtools/eclipse-plugin/trunk/maven-plugins/maven-emf-plugin/pom.xml?rev=385285&r1=385284&r2=385285&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/maven-plugins/maven-emf-plugin/pom.xml (original)
+++ geronimo/devtools/eclipse-plugin/trunk/maven-plugins/maven-emf-plugin/pom.xml Sun Mar 12 05:49:20 2006
@@ -27,6 +27,31 @@
<artifactId>org.eclipse.osgi</artifactId>
<version>3.1.2</version>
</dependency>
+ <!-- Dependencies for Crimson DOM Bug Workaround -->
+ <!--<dependency>
+ <groupId>xerces</groupId>
+ <artifactId>xercesImpl</artifactId>
+ <version>2.5.0</version>
+ <scope>runtime</scope>
+ </dependency>
+ <dependency>
+ <groupId>xerces</groupId>
+ <artifactId>xmlParserAPIs</artifactId>
+ <version>2.6.2</version>
+ <scope>runtime</scope>
+ </dependency>
+ <dependency>
+ <groupId>xerces</groupId>
+ <artifactId>xerces</artifactId>
+ <version>2.4.0</version>
+ <scope>runtime</scope>
+ </dependency>
+ <dependency>
+ <groupId>xml-resolver</groupId>
+ <artifactId>xml-resolver</artifactId>
+ <version>1.1</version>
+ <scope>runtime</scope>
+ </dependency>-->
</dependencies>
<build>
<plugins>
Modified: geronimo/devtools/eclipse-plugin/trunk/maven-plugins/maven-emf-plugin/src/main/java/org/apache/emf/plugin/LaunchOSGIMojo.java
URL: http://svn.apache.org/viewcvs/geronimo/devtools/eclipse-plugin/trunk/maven-plugins/maven-emf-plugin/src/main/java/org/apache/emf/plugin/LaunchOSGIMojo.java?rev=385285&r1=385284&r2=385285&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/maven-plugins/maven-emf-plugin/src/main/java/org/apache/emf/plugin/LaunchOSGIMojo.java (original)
+++ geronimo/devtools/eclipse-plugin/trunk/maven-plugins/maven-emf-plugin/src/main/java/org/apache/emf/plugin/LaunchOSGIMojo.java Sun Mar 12 05:49:20 2006
@@ -34,11 +34,16 @@
* @parameter expression="${settings.localRepository}/eclipse/eclipse"
*/
protected File eclipseHome;
+
+ /**
+ * @parameter expression="${project.basedir}"
+ */
+ protected File workspace;
/**
* @parameter expression="${project}"
*/
- protected MavenProject project;
+ protected MavenProject mavenProject;
/*
* (non-Javadoc)
@@ -57,10 +62,11 @@
if (getLog().isDebugEnabled())
System.setProperty(EclipseStarter.PROP_CONSOLE_LOG, "true");
+
System.setProperty(EclipseStarter.PROP_CLEAN, "true");
System.setProperty(EclipseStarter.PROP_INSTALL_AREA, eclipseHome.getAbsolutePath());
System.setProperty(EclipseStarter.PROP_FRAMEWORK, osgi.toExternalForm());
- System.setProperty(LocationManager.PROP_INSTANCE_AREA, project.getBuild().getOutputDirectory());
+ System.setProperty(LocationManager.PROP_INSTANCE_AREA, workspace.getAbsolutePath());
System.setProperty("eclipse.application", getApplicationID());
String[] args = getArguments();
@@ -72,7 +78,7 @@
try {
EclipseStarter.run(args, null);
} catch (Exception e) {
- e.printStackTrace();
+ throw new MojoFailureException(e.getMessage());
}
}
@@ -98,5 +104,8 @@
}
return null;
}
-
+
+ protected String getVMArgs() {
+ return null;
+ }
}
Modified: geronimo/devtools/eclipse-plugin/trunk/maven-plugins/maven-emf-plugin/src/main/java/org/apache/emf/plugin/XSDImporterMojo.java
URL: http://svn.apache.org/viewcvs/geronimo/devtools/eclipse-plugin/trunk/maven-plugins/maven-emf-plugin/src/main/java/org/apache/emf/plugin/XSDImporterMojo.java?rev=385285&r1=385284&r2=385285&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/maven-plugins/maven-emf-plugin/src/main/java/org/apache/emf/plugin/XSDImporterMojo.java (original)
+++ geronimo/devtools/eclipse-plugin/trunk/maven-plugins/maven-emf-plugin/src/main/java/org/apache/emf/plugin/XSDImporterMojo.java Sun Mar 12 05:49:20 2006
@@ -21,45 +21,65 @@
import java.util.Set;
import java.util.StringTokenizer;
+import org.apache.maven.artifact.Artifact;
+
/**
- * @goal xsd2java
+ * @goal xsd2genmodel
+ * @requiresDependencyResolution
*/
public class XSDImporterMojo extends LaunchOSGIMojo {
public static final String APPLICATION_ID = "org.eclipse.xsd.ecore.importer.XSD2GenModel";
-
+
/**
* @parameter
* @required
*/
protected File[] schemas;
-
+
/**
* @parameter
* @required
*/
protected File genmodel;
-
+
+ /**
+ * @parameter
+ */
+ protected String modelProject;
+
+ /**
+ * @parameter
+ */
+ protected String editProject;
+
+ /**
+ * @parameter
+ */
+ protected String editorProject;
+
/**
* @parameter
* @required
*/
- protected String type;
+ protected String src;
/**
* @parameter
*/
protected String[] packages;
-
+
/**
* @parameter
*/
protected Map packagemap;
-
+
/**
* @paramter expression="false"
*/
protected boolean reload;
+
+ protected Artifact[] vmargs;
public static final String SPACE = " ";
@@ -70,7 +90,6 @@
*/
protected String[] getArguments() {
String params = processParameters().toString();
- getLog().info(params.toString());
StringTokenizer st = new StringTokenizer(params);
String[] args = new String[st.countTokens()];
int i = 0;
@@ -91,25 +110,22 @@
protected StringBuffer processParameters() {
StringBuffer buffer = new StringBuffer();
-
- for(int i = 0; i < schemas.length; i++) {
+
+ for (int i = 0; i < schemas.length; i++) {
buffer.append(schemas[i].getAbsolutePath()).append(SPACE);
}
-
+
buffer.append(genmodel.getAbsolutePath()).append(SPACE);
- if(reload)
+ if (reload)
buffer.append("-reload").append(SPACE);
-
- if ("model".equals(type)) {
- buffer.append("-modelProject");
- } else if ("edit".equals(type)) {
- buffer.append("-editProject");
- } else if ("editor".equals(type)) {
- buffer.append("-editorProject");
- }
- buffer.append(SPACE);
- buffer.append(project.getBasedir()).append(SPACE);
- buffer.append(getRelativeSrcDir()).append(SPACE);
+
+ if (modelProject != null)
+ buffer.append("-modelProject").append(SPACE).append(modelProject).append(SPACE).append(src).append(SPACE);
+ if (editProject != null)
+ buffer.append("-editProject").append(SPACE).append(editProject).append(SPACE).append(src).append(SPACE);
+ if (editorProject != null)
+ buffer.append("-editorProject").append(SPACE).append(editorProject).append(SPACE).append(src).append(SPACE);
+
if (packages != null) {
buffer.append("-packages").append(SPACE);
for (int i = 0; i < packages.length; i++) {
@@ -128,13 +144,4 @@
}
return buffer;
}
-
- private String getRelativeSrcDir() {
- String src = project.getBuild().getSourceDirectory();
- src = src.split(project.getBasedir().getAbsolutePath())[1];
- if (src.startsWith(File.separator))
- src = src.substring(1);
- return src;
- }
-
}
Modified: geronimo/devtools/eclipse-plugin/trunk/maven-plugins/maven-geronimodevtools-plugin/src/main/java/org/apache/geronimo/eclipse/devtools/InstallPluginDependenciesMojo.java
URL: http://svn.apache.org/viewcvs/geronimo/devtools/eclipse-plugin/trunk/maven-plugins/maven-geronimodevtools-plugin/src/main/java/org/apache/geronimo/eclipse/devtools/InstallPluginDependenciesMojo.java?rev=385285&r1=385284&r2=385285&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/maven-plugins/maven-geronimodevtools-plugin/src/main/java/org/apache/geronimo/eclipse/devtools/InstallPluginDependenciesMojo.java (original)
+++ geronimo/devtools/eclipse-plugin/trunk/maven-plugins/maven-geronimodevtools-plugin/src/main/java/org/apache/geronimo/eclipse/devtools/InstallPluginDependenciesMojo.java Sun Mar 12 05:49:20 2006
@@ -132,8 +132,6 @@
}
protected void process(File file, int depth, Dependency dependency) {
- getLog().debug("processFile() depth = " + Integer.toString(depth) + " "
- + file.getAbsolutePath());
if (file.isDirectory()) {
depth++;
File[] members = file.listFiles();
Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.deployment.model/pom.xml
URL: http://svn.apache.org/viewcvs/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.deployment.model/pom.xml?rev=385285&r1=385284&r2=385285&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.deployment.model/pom.xml (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.deployment.model/pom.xml Sun Mar 12 05:49:20 2006
@@ -9,6 +9,9 @@
<artifactId>geronimo-eclipse-plugin</artifactId>
<version>1.0</version>
</parent>
+ <properties>
+ <imported-resources>${project.build.directory}/imported-resources</imported-resources>
+ </properties>
<build>
<resources>
<resource>
@@ -45,65 +48,12 @@
<type>jar</type>
</artifactItem>
</artifactItems>
- <outputDirectory>imported-resources</outputDirectory>
+ <outputDirectory>${imported-resources}</outputDirectory>
</configuration>
</plugin>
- <plugin>
- <groupId>org.apache.geronimo.devtools</groupId>
- <artifactId>maven-emf-plugin</artifactId>
- <executions>
- <execution>
- <id>execution-web</id>
- <phase>generate-sources</phase>
- <goals>
- <goal>xsd2java</goal>
- </goals>
- <configuration>
- <schemas>
- <schema>geronimo-web-1.0.xsd</schema>
- </schemas>
- <genmodel>geronimo-web.genmodel</genmodel>
- <type>model</type>
- <packages>
- <package>http://geronimo.apache.org/xml/ns/naming-1.0</package>
- <package>http://geronimo.apache.org/xml/ns/security-1.1</package>
- <package>http://geronimo.apache.org/xml/ns/deployment-1.0</package>
- <package>http://geronimo.apache.org/xml/ns/j2ee/web-1.0</package>
- </packages>
- <packagemap>
- <org.apache.geronimo.xml.ns.naming>http://geronimo.apache.org/xml/ns/naming-1.0</org.apache.geronimo.xml.ns.naming>
- <org.apache.geronimo.xml.ns.security>http://geronimo.apache.org/xml/ns/security-1.1</org.apache.geronimo.xml.ns.security>
- <org.apache.geronimo.xml.ns.deployment>http://geronimo.apache.org/xml/ns/deployment-1.0</org.apache.geronimo.xml.ns.deployment>
- <org.apache.geronimo.xml.ns.j2ee.web>http://geronimo.apache.org/xml/ns/j2ee/web-1.0</org.apache.geronimo.xml.ns.j2ee.web>
- </packagemap>
- </configuration>
- </execution>
- </executions>
- </plugin>
</plugins>
</build>
<dependencies>
- <!-- Dependencies for Crimson DOM Bug Workaround -->
- <dependency>
- <groupId>xerces</groupId>
- <artifactId>xercesImpl</artifactId>
- <version>${xercesImpl_version}</version>
- </dependency>
- <dependency>
- <groupId>xerces</groupId>
- <artifactId>xmlParserAPIs</artifactId>
- <version>${xmlParserAPIs_version}</version>
- </dependency>
- <dependency>
- <groupId>xerces</groupId>
- <artifactId>xerces</artifactId>
- <version>${xerces_version}</version>
- </dependency>
- <dependency>
- <groupId>xml-resolver</groupId>
- <artifactId>xml-resolver</artifactId>
- <version>${xml_resolver_version}</version>
- </dependency>
<!-- Eclipse Plugin Dependencies -->
<dependency>
<groupId>org.eclipse.plugins</groupId>