You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by mc...@apache.org on 2008/03/17 22:21:11 UTC
svn commit: r638069 - in /geronimo/devtools/eclipse-plugin/trunk: ./
eclipse/ plugins/org.apache.geronimo.deployment.v11.jaxbmodel/
plugins/org.apache.geronimo.deployment.v21.jaxbmodel/
plugins/org.apache.geronimo.runtime.common/ plugins/org.apache.ger...
Author: mcconne
Date: Mon Mar 17 14:21:08 2008
New Revision: 638069
URL: http://svn.apache.org/viewvc?rev=638069&view=rev
Log:
Fix Dependency and Plugin management and use correct versions of the JAXB artifacts
Modified:
geronimo/devtools/eclipse-plugin/trunk/eclipse/build.xml
geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.deployment.v11.jaxbmodel/pom.xml
geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.deployment.v21.jaxbmodel/pom.xml
geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.runtime.common/META-INF/MANIFEST.MF
geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.runtime.common/pom.xml
geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.runtime.v20/pom.xml
geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.runtime.v21/pom.xml
geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v20.ui/src/org/apache/geronimo/st/v20/ui/editors/GeronimoFormContentLoader.java
geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.core/src/org/apache/geronimo/st/v21/core/DeploymentPlanInstallConfig.java
geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.core/src/org/apache/geronimo/st/v21/core/internal/Trace.java
geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.core/src/org/apache/geronimo/st/v21/core/operations/GeronimoV21FacetInstallDelegate.java
geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.core/src/org/apache/geronimo/st/v21/core/operations/V21DeploymentPlanCreationOperation.java
geronimo/devtools/eclipse-plugin/trunk/pom.xml
Modified: geronimo/devtools/eclipse-plugin/trunk/eclipse/build.xml
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/eclipse/build.xml?rev=638069&r1=638068&r2=638069&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/eclipse/build.xml (original)
+++ geronimo/devtools/eclipse-plugin/trunk/eclipse/build.xml Mon Mar 17 14:21:08 2008
@@ -26,7 +26,6 @@
<target name="init">
<property name="europa_drop" value="R-3.3.2-200802211800"/>
<property name="dtp_drop" value="1.5"/>
- <property name="emf_drop" value="R200802051830"/>
<property name="gef_drop" value="R200802211602"/>
<property name="wtp_drop" value="R-2.0.2-20080223205547"/>
@@ -36,7 +35,6 @@
<property name="europa_macos_url" value="${base_url}/eclipse/downloads/drops/${europa_drop}/"/>
<property name="dtp_download_url" value="${base_url}/datatools/downloads/${dtp_drop}/"/>
- <property name="emf_download_url" value="${base_url}/modeling/emf/emf/downloads/drops/2.3.2/${emf_drop}/"/>
<property name="gef_download_url" value="${base_url}/tools/gef/downloads/drops/3.3.2/${gef_drop}/"/>
<property name="wtp_download_url" value="${base_url}/webtools/downloads/drops/R2.0/${wtp_drop}/"/>
@@ -47,7 +45,6 @@
<property name="europa_jee_macos_gz" value="${europa_jee_macos}.gz"/>
<property name="dtp_sdk" value="dtp-sdk_1.5.2_022008.zip"/>
- <property name="emf_sdo" value="emf-sdo-xsd-SDK-2.3.2.zip"/>
<property name="gef_sdk" value="GEF-SDK-3.3.2.zip"/>
<property name="wtp_sdk" value="wtp-sdk-${wtp_drop}.zip"/>
@@ -130,7 +127,6 @@
<target name="common" depends="init" description="Download artifacts common to all OS'es">
<antcall target="dtp"/>
- <antcall target="emf"/>
<antcall target="gef"/>
<antcall target="wtp"/>
</target>
@@ -156,30 +152,6 @@
<echo>#################################################################################</echo>
<mkdir dir="${LOCAL_M2_REPO}/eclipse"/>
<unzip src="${LOCAL_M2_REPO}/eclipse-downloads/${dtp_sdk}"
- dest="${LOCAL_M2_REPO}/eclipse"/>
- </target>
-
- <target name="emf" depends="init" description="Download Eclipse Modeling Framework (EMF) artifact">
- <echo>#################################################################################</echo>
- <echo>## </echo>
- <echo>## Downloading: ${emf_sdo} </echo>
- <echo>## </echo>
- <echo>## From: ${emf_download_url} </echo>
- <echo>## </echo>
- <echo>#################################################################################</echo>
- <mkdir dir="${LOCAL_M2_REPO}/eclipse-downloads"/>
- <get src="${emf_download_url}${emf_sdo}${protocol}"
- dest="${LOCAL_M2_REPO}/eclipse-downloads/${emf_sdo}"
- verbose="true"
- ignoreerrors="true"
- usetimestamp="true"/>
- <echo>#################################################################################</echo>
- <echo>## </echo>
- <echo>## Unzipping: ${emf_sdo} </echo>
- <echo>## </echo>
- <echo>#################################################################################</echo>
- <mkdir dir="${LOCAL_M2_REPO}/eclipse"/>
- <unzip src="${LOCAL_M2_REPO}/eclipse-downloads/${emf_sdo}"
dest="${LOCAL_M2_REPO}/eclipse"/>
</target>
Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.deployment.v11.jaxbmodel/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.deployment.v11.jaxbmodel/pom.xml?rev=638069&r1=638068&r2=638069&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.deployment.v11.jaxbmodel/pom.xml (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.deployment.v11.jaxbmodel/pom.xml Mon Mar 17 14:21:08 2008
@@ -17,58 +17,79 @@
<!-- $Rev$ $Date$ -->
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
- <modelVersion>4.0.0</modelVersion>
+ <modelVersion>4.0.0</modelVersion>
- <artifactId>org.apache.geronimo.deployment.v11.jaxbmodel</artifactId>
- <packaging>jar</packaging>
- <name>${artifactId}</name>
- <parent>
- <groupId>org.apache.geronimo.devtools</groupId>
- <artifactId>eclipse-plugins-parent</artifactId>
- <version>2.1.0</version>
- <relativePath>../pom.xml</relativePath>
- </parent>
+ <artifactId>org.apache.geronimo.deployment.v11.jaxbmodel</artifactId>
+ <packaging>jar</packaging>
+ <name>${artifactId}</name>
+ <parent>
+ <groupId>org.apache.geronimo.devtools</groupId>
+ <artifactId>eclipse-plugins-parent</artifactId>
+ <version>2.1.0</version>
+ <relativePath>../pom.xml</relativePath>
+ </parent>
- <dependencies>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>3.8.1</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>javax.xml.bind</groupId>
- <artifactId>jaxb-api</artifactId>
- <version>2.1</version>
- </dependency>
- </dependencies>
+ <dependencies>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>javax.xml.bind</groupId>
+ <artifactId>jaxb-api</artifactId>
+ <exclusions>
+ <exclusion>
+ <groupId>javax.xml.bind</groupId>
+ <artifactId>jsr173_api</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>com.sun.xml.bind</groupId>
+ <artifactId>jaxb-xjc</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>com.sun.xml.bind</groupId>
+ <artifactId>jaxb-impl</artifactId>
+ <exclusions>
+ <exclusion>
+ <groupId>javax.xml.bind</groupId>
+ <artifactId>jsr173_api</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>javax.xml.bind</groupId>
+ <artifactId>activation</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ </dependencies>
- <build>
- <plugins>
- <plugin>
- <groupId>com.sun.tools.xjc.maven2</groupId>
- <artifactId>maven-jaxb-plugin</artifactId>
- <version>1.1</version>
- <executions>
- <execution>
- <goals>
- <goal>generate</goal>
- </goals>
- </execution>
- </executions>
- <configuration>
- <strict>false</strict>
- <args>-extension</args>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <configuration>
- <source>1.5</source>
- <target>1.5</target>
- </configuration>
- </plugin>
- </plugins>
- </build>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>com.sun.tools.xjc.maven2</groupId>
+ <artifactId>maven-jaxb-plugin</artifactId>
+ <executions>
+ <execution>
+ <goals>
+ <goal>generate</goal>
+ </goals>
+ </execution>
+ </executions>
+ <configuration>
+ <strict>false</strict>
+ <args>-extension</args>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <configuration>
+ <source>1.5</source>
+ <target>1.5</target>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
</project>
Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.deployment.v21.jaxbmodel/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.deployment.v21.jaxbmodel/pom.xml?rev=638069&r1=638068&r2=638069&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.deployment.v21.jaxbmodel/pom.xml (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.deployment.v21.jaxbmodel/pom.xml Mon Mar 17 14:21:08 2008
@@ -33,13 +33,35 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
- <version>3.8.1</version>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>javax.xml.bind</groupId>
- <artifactId>jaxb-api</artifactId>
- <version>2.1</version>
+ <groupId>javax.xml.bind</groupId>
+ <artifactId>jaxb-api</artifactId>
+ <exclusions>
+ <exclusion>
+ <groupId>javax.xml.bind</groupId>
+ <artifactId>jsr173_api</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>com.sun.xml.bind</groupId>
+ <artifactId>jaxb-xjc</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>com.sun.xml.bind</groupId>
+ <artifactId>jaxb-impl</artifactId>
+ <exclusions>
+ <exclusion>
+ <groupId>javax.xml.bind</groupId>
+ <artifactId>jsr173_api</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>javax.xml.bind</groupId>
+ <artifactId>activation</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
</dependencies>
@@ -48,7 +70,6 @@
<plugin>
<groupId>com.sun.tools.xjc.maven2</groupId>
<artifactId>maven-jaxb-plugin</artifactId>
- <version>1.1</version>
<executions>
<execution>
<goals>
Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.runtime.common/META-INF/MANIFEST.MF
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.runtime.common/META-INF/MANIFEST.MF?rev=638069&r1=638068&r2=638069&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.runtime.common/META-INF/MANIFEST.MF (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.runtime.common/META-INF/MANIFEST.MF Mon Mar 17 14:21:08 2008
@@ -9,9 +9,9 @@
lib/cglib-nodep-2.1_3.jar,
lib/xstream-1.2.1.jar,
lib/xpp3-1.1.3.3.jar,
- lib/jaxb-api-2.1.jar,
- lib/jaxb-impl-2.1.4.jar,
- lib/stax-api-1.0-2.jar,
+ lib/jaxb-api-2.0.jar,
+ lib/jaxb-impl-2.0.5.jar,
+ lib/geronimo-stax-api_1.0_spec-1.0.1.jar,
lib/activation-1.1.jar
Export-Package:
com.sun.istack,
Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.runtime.common/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.runtime.common/pom.xml?rev=638069&r1=638068&r2=638069&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.runtime.common/pom.xml (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.runtime.common/pom.xml Mon Mar 17 14:21:08 2008
@@ -70,22 +70,18 @@
<artifactItem>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-j2ee-deployment_1.1_spec</artifactId>
- <version>1.0</version>
</artifactItem>
<artifactItem>
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
- <version>1.0.4</version>
</artifactItem>
<artifactItem>
<groupId>cglib</groupId>
<artifactId>cglib-nodep</artifactId>
- <version>2.1_3</version>
</artifactItem>
<artifactItem>
- <groupId>stax</groupId>
- <artifactId>stax-api</artifactId>
- <version>1.0-2</version>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-stax-api_1.0_spec</artifactId>
</artifactItem>
<artifactItem>
<groupId>com.thoughtworks.xstream</groupId>
@@ -98,17 +94,14 @@
<artifactItem>
<groupId>javax.xml.bind</groupId>
<artifactId>jaxb-api</artifactId>
- <version>2.1</version>
</artifactItem>
<artifactItem>
<groupId>com.sun.xml.bind</groupId>
<artifactId>jaxb-impl</artifactId>
- <version>2.1.4</version>
</artifactItem>
<artifactItem>
<groupId>javax.activation</groupId>
<artifactId>activation</artifactId>
- <version>1.1</version>
</artifactItem>
</artifactItems>
</configuration>
@@ -165,7 +158,6 @@
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-j2ee-deployment_1.1_spec</artifactId>
- <version>1.0</version>
</dependency>
<dependency>
<groupId>com.thoughtworks.xstream</groupId>
@@ -178,17 +170,30 @@
<dependency>
<groupId>javax.xml.bind</groupId>
<artifactId>jaxb-api</artifactId>
- <version>2.1</version>
+ <exclusions>
+ <exclusion>
+ <groupId>javax.xml.bind</groupId>
+ <artifactId>jsr173_api</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>com.sun.xml.bind</groupId>
<artifactId>jaxb-impl</artifactId>
- <version>2.1.4</version>
+ <exclusions>
+ <exclusion>
+ <groupId>javax.xml.bind</groupId>
+ <artifactId>jsr173_api</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>javax.xml.bind</groupId>
+ <artifactId>activation</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>javax.activation</groupId>
<artifactId>activation</artifactId>
- <version>1.1</version>
</dependency>
</dependencies>
</project>
Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.runtime.v20/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.runtime.v20/pom.xml?rev=638069&r1=638068&r2=638069&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.runtime.v20/pom.xml (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.runtime.v20/pom.xml Mon Mar 17 14:21:08 2008
@@ -111,7 +111,6 @@
<artifactItem>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-javaee-deployment_1.1MR3_spec</artifactId>
- <version>1.0</version>
</artifactItem>
</artifactItems>
<outputDirectory>lib</outputDirectory>
@@ -210,7 +209,6 @@
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-javaee-deployment_1.1MR3_spec</artifactId>
- <version>1.0</version>
</dependency>
<dependency>
<groupId>org.apache.geronimo.devtools</groupId>
Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.runtime.v21/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.runtime.v21/pom.xml?rev=638069&r1=638068&r2=638069&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.runtime.v21/pom.xml (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.runtime.v21/pom.xml Mon Mar 17 14:21:08 2008
@@ -111,12 +111,10 @@
<artifactItem>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-javaee-deployment_1.1MR3_spec</artifactId>
- <version>1.0</version>
</artifactItem>
<artifactItem>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-archiver</artifactId>
- <version>1.0-alpha-7</version>
</artifactItem>
</artifactItems>
<outputDirectory>lib</outputDirectory>
@@ -215,7 +213,6 @@
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-javaee-deployment_1.1MR3_spec</artifactId>
- <version>1.0</version>
</dependency>
<dependency>
<groupId>org.apache.geronimo.devtools</groupId>
@@ -225,7 +222,6 @@
<dependency>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-archiver</artifactId>
- <version>1.0-alpha-7</version>
</dependency>
</dependencies>
</project>
Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v20.ui/src/org/apache/geronimo/st/v20/ui/editors/GeronimoFormContentLoader.java
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v20.ui/src/org/apache/geronimo/st/v20/ui/editors/GeronimoFormContentLoader.java?rev=638069&r1=638068&r2=638069&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v20.ui/src/org/apache/geronimo/st/v20/ui/editors/GeronimoFormContentLoader.java (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v20.ui/src/org/apache/geronimo/st/v20/ui/editors/GeronimoFormContentLoader.java Mon Mar 17 14:21:08 2008
@@ -17,6 +17,7 @@
package org.apache.geronimo.st.v20.ui.editors;
import java.io.File;
+import java.io.FileOutputStream;
import java.io.IOException;
import javax.xml.bind.JAXBContext;
@@ -97,7 +98,8 @@
public void saveDeploymentPlan(JAXBElement deploymentPlan, IFile file) throws IOException, JAXBException {
JAXBContext jb = JAXBContext.newInstance( "org.apache.geronimo.xml.ns.j2ee.web_2_0:org.apache.geronimo.xml.ns.j2ee.application_2:org.apache.geronimo.xml.ns.deployment_1:org.apache.geronimo.xml.ns.naming_1:org.apache.geronimo.xml.ns.security_2", Activator.class.getClassLoader() );
- jb.createMarshaller().marshal( deploymentPlan, new File( file.getLocationURI().toURL().getFile()) );
+// jb.createMarshaller().marshal( deploymentPlan, new File( file.getLocationURI().toURL().getFile()) );
+ jb.createMarshaller().marshal( deploymentPlan, new FileOutputStream( new File( file.getLocationURI().toURL().getFile()) ) );
}
protected FormPage getWebNamingPage(FormEditor editor) {
Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.core/src/org/apache/geronimo/st/v21/core/DeploymentPlanInstallConfig.java
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.core/src/org/apache/geronimo/st/v21/core/DeploymentPlanInstallConfig.java?rev=638069&r1=638068&r2=638069&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.core/src/org/apache/geronimo/st/v21/core/DeploymentPlanInstallConfig.java (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.core/src/org/apache/geronimo/st/v21/core/DeploymentPlanInstallConfig.java Mon Mar 17 14:21:08 2008
@@ -39,7 +39,7 @@
{
public Object create()
{
- Trace.trace("Entry/Exit", "DeploymentPlanInstallConfig.create");
+ Trace.tracePoint("Entry/Exit", "DeploymentPlanInstallConfig.create");
return new DeploymentPlanInstallConfig();
}
}
Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.core/src/org/apache/geronimo/st/v21/core/internal/Trace.java
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.core/src/org/apache/geronimo/st/v21/core/internal/Trace.java?rev=638069&r1=638068&r2=638069&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.core/src/org/apache/geronimo/st/v21/core/internal/Trace.java (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.core/src/org/apache/geronimo/st/v21/core/internal/Trace.java Mon Mar 17 14:21:08 2008
@@ -92,29 +92,29 @@
* or
* Return value if the trace point is an "Exit"
*/
- public static void trace(String tracePoint, String classDotMethod) {
+ public static void tracePoint(String tracePoint, String classDotMethod) {
trace(Trace.INFO, tracePoint + ": " + classDotMethod + "()" );
}
- public static void trace(String tracePoint, String classDotMethod, Object parm1) {
+ public static void tracePoint(String tracePoint, String classDotMethod, Object parm1) {
trace(Trace.INFO, tracePoint + ": " + classDotMethod + "( parm1=[" + (parm1 == null ? null : parm1.toString()) + "] )" );
}
- public static void trace(String tracePoint, String classDotMethod, Object parm1, Object parm2) {
+ public static void tracePoint(String tracePoint, String classDotMethod, Object parm1, Object parm2) {
trace(Trace.INFO, tracePoint + ": " + classDotMethod + "( parm1=[" + (parm1 == null ? null : parm1.toString()) + "], " +
"parm2=[" + (parm2 == null ? null : parm2.toString()) + "] )" );
}
- public static void trace(String tracePoint, String classDotMethod, Object parm1, Object parm2, Object parm3) {
+ public static void tracePoint(String tracePoint, String classDotMethod, Object parm1, Object parm2, Object parm3) {
trace(Trace.INFO, tracePoint + ": " + classDotMethod + "( parm1=[" + (parm1 == null ? null : parm1.toString()) + "], " +
"parm2=[" + (parm2 == null ? null : parm2.toString()) + "], " +
"parm3=[" + (parm3 == null ? null : parm3.toString()) + "] )" );
}
- public static void trace(String tracePoint, String classDotMethod, Object parm1, Object parm2, Object parm3, Object parm4) {
+ public static void tracePoint(String tracePoint, String classDotMethod, Object parm1, Object parm2, Object parm3, Object parm4) {
trace(Trace.INFO, tracePoint + ": " + classDotMethod + "( parm1=[" + (parm1 == null ? null : parm1.toString()) + "], " +
"parm2=[" + (parm2 == null ? null : parm2.toString()) + "], " +
"parm3=[" + (parm3 == null ? null : parm3.toString()) + "], " +
"parm4=[" + (parm4 == null ? null : parm4.toString()) + "] )" );
}
- public static void trace(String tracePoint, String classDotMethod, Object parm1, Object parm2, Object parm3, Object parm4, Object parm5) {
+ public static void tracePoint(String tracePoint, String classDotMethod, Object parm1, Object parm2, Object parm3, Object parm4, Object parm5) {
trace(Trace.INFO, tracePoint + ": " + classDotMethod + "( parm1=[" + (parm1 == null ? null : parm1.toString()) + "], " +
"parm2=[" + (parm2 == null ? null : parm2.toString()) + "], " +
"parm3=[" + (parm3 == null ? null : parm3.toString()) + "], " +
Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.core/src/org/apache/geronimo/st/v21/core/operations/GeronimoV21FacetInstallDelegate.java
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.core/src/org/apache/geronimo/st/v21/core/operations/GeronimoV21FacetInstallDelegate.java?rev=638069&r1=638068&r2=638069&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.core/src/org/apache/geronimo/st/v21/core/operations/GeronimoV21FacetInstallDelegate.java (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.core/src/org/apache/geronimo/st/v21/core/operations/GeronimoV21FacetInstallDelegate.java Mon Mar 17 14:21:08 2008
@@ -31,12 +31,12 @@
public class GeronimoV21FacetInstallDelegate extends GeronimoFacetInstallDelegate {
public IDataModelOperation createDeploymentPlanCreationOp(IProject project, Object config) {
- Trace.trace("Entry", "GeronimoV21FacetInstallDelegate.createDeploymentPlanCreationOp", project, config);
+ Trace.tracePoint("Entry", "GeronimoV21FacetInstallDelegate.createDeploymentPlanCreationOp", project, config);
IDataModel model = DataModelFactory.createDataModel(new JavaProjectFacetCreationDataModelProvider());
model.setStringProperty(IFacetDataModelProperties.FACET_PROJECT_NAME, project.getName());
- Trace.trace("Exit", "GeronimoV21FacetInstallDelegate.createDeploymentPlanCreationOp");
+ Trace.tracePoint("Exit ", "GeronimoV21FacetInstallDelegate.createDeploymentPlanCreationOp");
return new V21DeploymentPlanCreationOperation(model, config);
}
}
Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.core/src/org/apache/geronimo/st/v21/core/operations/V21DeploymentPlanCreationOperation.java
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.core/src/org/apache/geronimo/st/v21/core/operations/V21DeploymentPlanCreationOperation.java?rev=638069&r1=638068&r2=638069&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.core/src/org/apache/geronimo/st/v21/core/operations/V21DeploymentPlanCreationOperation.java (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.core/src/org/apache/geronimo/st/v21/core/operations/V21DeploymentPlanCreationOperation.java Mon Mar 17 14:21:08 2008
@@ -42,7 +42,7 @@
public V21DeploymentPlanCreationOperation(IDataModel model, Object config) {
super(model, config);
- Trace.trace("Constructor Entry/Exit", "V21DeploymentPlanCreationOperation", model, config);
+ Trace.tracePoint("Constructor Entry/Exit", "V21DeploymentPlanCreationOperation", model, config);
}
/*
@@ -51,7 +51,7 @@
* @see org.apache.geronimo.st.core.operations.IDeploymentPlanCreationOp#createGeronimoApplicationDeploymentPlan(org.eclipse.core.resources.IFile)
*/
public JAXBElement createGeronimoApplicationDeploymentPlan(IFile dpFile) {
-// Trace.trace("Entry", "V21DeploymentPlanCreationOperation.createGeronimoApplicationDeploymentPlan", dpFile);
+ Trace.tracePoint("Entry", "V21DeploymentPlanCreationOperation.createGeronimoApplicationDeploymentPlan", dpFile);
org.apache.geronimo.xml.ns.j2ee.application_2.ObjectFactory applicationFactory = new org.apache.geronimo.xml.ns.j2ee.application_2.ObjectFactory();
ApplicationType application = applicationFactory.createApplicationType();
@@ -80,7 +80,7 @@
save(resource);
*/
-// Trace.trace("Exit", "V21DeploymentPlanCreationOperation.createGeronimoApplicationDeploymentPlan", root);
+// Trace.tracePoint("Exit ", "V21DeploymentPlanCreationOperation.createGeronimoApplicationDeploymentPlan", root);
return applicationFactory.createApplication(application);
}
@@ -90,10 +90,11 @@
* @see org.apache.geronimo.st.core.operations.IDeploymentPlanCreationOp#createGeronimoWebDeploymentPlan(org.eclipse.core.resources.IFile)
*/
public JAXBElement createGeronimoWebDeploymentPlan(IFile dpFile) {
-// Trace.trace("Entry", "V21DeploymentPlanCreationOperation.createGeronimoWebDeploymentPlan", dpFile);
+ Trace.tracePoint("Entry", "V21DeploymentPlanCreationOperation.createGeronimoWebDeploymentPlan", dpFile);
org.apache.geronimo.xml.ns.j2ee.web_2_0.ObjectFactory webFactory = new org.apache.geronimo.xml.ns.j2ee.web_2_0.ObjectFactory();
WebAppType web = webFactory.createWebAppType();
+
/*
URI uri = URI.createPlatformResourceURI(dpFile.getFullPath().toString(), false);
@@ -121,7 +122,7 @@
save(resource);
-// Trace.trace("Exit", "V21DeploymentPlanCreationOperation.createGeronimoWebDeploymentPlan", root);
+// Trace.tracePoint("Exit ", "V21DeploymentPlanCreationOperation.createGeronimoWebDeploymentPlan", root);
return new JAXBElement<JAXBElement>();
*/
return webFactory.createWebApp(web);
@@ -133,7 +134,8 @@
* @see org.apache.geronimo.st.core.operations.IDeploymentPlanCreationOp#createOpenEjbDeploymentPlan(org.eclipse.core.resources.IFile)
*/
public JAXBElement createOpenEjbDeploymentPlan(IFile dpFile) {
-// Trace.trace("Entry", "V21DeploymentPlanCreationOperation.createOpenEjbDeploymentPlan", dpFile);
+ Trace.tracePoint("Entry", "V21DeploymentPlanCreationOperation.createOpenEjbDeploymentPlan", dpFile);
+
org.apache.geronimo.xml.ns.j2ee.ejb.openejb_2.ObjectFactory ejbFactory = new org.apache.geronimo.xml.ns.j2ee.ejb.openejb_2.ObjectFactory();
GeronimoEjbJarType ejbjar = ejbFactory.createGeronimoEjbJarType();
@@ -163,7 +165,7 @@
save(resource);
-// Trace.trace("Exit", "V21DeploymentPlanCreationOperation.createOpenEjbDeploymentPlan", root);
+// Trace.tracePoint("Exit ", "V21DeploymentPlanCreationOperation.createOpenEjbDeploymentPlan", root);
return root;
*/
return ejbFactory.createEjbJar(ejbjar);
@@ -176,7 +178,7 @@
* @see org.apache.geronimo.st.core.operations.IDeploymentPlanCreationOp#createConnectorDeploymentPlan(org.eclipse.core.resources.IFile)
*/
public JAXBElement createConnectorDeploymentPlan(IFile dpFile) {
-// Trace.trace("Entry", "V21DeploymentPlanCreationOperation.createConnectorDeploymentPlan", dpFile);
+ Trace.tracePoint("Entry", "V21DeploymentPlanCreationOperation.createConnectorDeploymentPlan", dpFile);
org.apache.geronimo.xml.ns.j2ee.connector_1.ObjectFactory connectorFactory = new org.apache.geronimo.xml.ns.j2ee.connector_1.ObjectFactory();
ConnectorType connector = connectorFactory.createConnectorType();
@@ -204,13 +206,13 @@
save(resource);
-// Trace.trace("Exit", "V21DeploymentPlanCreationOperation.createConnectorDeploymentPlan", root);
+// Trace.tracePoint("Exit ", "V21DeploymentPlanCreationOperation.createConnectorDeploymentPlan", root);
return root;
*/
}
public JAXBElement createServiceDeploymentPlan(IFile dpFile) {
-// Trace.trace("Entry", "V21DeploymentPlanCreationOperation.createServiceDeploymentPlan", dpFile);
+ Trace.tracePoint("Entry", "V21DeploymentPlanCreationOperation.createServiceDeploymentPlan", dpFile);
org.apache.geronimo.xml.ns.deployment_1.ObjectFactory serviceFactory = new org.apache.geronimo.xml.ns.deployment_1.ObjectFactory();
org.apache.geronimo.xml.ns.deployment_1.ModuleType module = serviceFactory.createModuleType();
@@ -236,13 +238,13 @@
save(resource);
-// Trace.trace("Exit", "V21DeploymentPlanCreationOperation.createServiceDeploymentPlan", root);
+// Trace.tracePoint("Exit ", "V21DeploymentPlanCreationOperation.createServiceDeploymentPlan", root);
return root;
*/
}
public EnvironmentType getConfigEnvironment() {
-// Trace.trace("Entry", "V21DeploymentPlanCreationOperation.getConfigEnvironment");
+ Trace.tracePoint("Entry", "V21DeploymentPlanCreationOperation.getConfigEnvironment");
if (config != null && config instanceof DeploymentPlanInstallConfig) {
cfg = (DeploymentPlanInstallConfig) config;
@@ -270,12 +272,13 @@
env.setDependencies(dt);
}
-// Trace.trace("Exit", "V21DeploymentPlanCreationOperation.getConfigEnvironment", env);
+ Trace.tracePoint("Exit ", "V21DeploymentPlanCreationOperation.getConfigEnvironment", env);
return env;
}
public static ArtifactType createArtifactType(String groupId, String artifactId, String version, String type) {
-// Trace.trace("Entry", "V21DeploymentPlanCreationOperation.createArtifactType", groupId, artifactId, version, type);
+ Trace.tracePoint("Entry", "V21DeploymentPlanCreationOperation.createArtifactType", groupId, artifactId, version, type);
+
org.apache.geronimo.xml.ns.deployment_1.ObjectFactory serviceFactory = new org.apache.geronimo.xml.ns.deployment_1.ObjectFactory();
ArtifactType artifact = serviceFactory.createArtifactType();
@@ -287,12 +290,13 @@
artifact.setVersion(version);
artifact.setType(type);
-// Trace.trace("Exit", "V21DeploymentPlanCreationOperation.createArtifactType", artifact);
+ Trace.tracePoint("Exit ", "V21DeploymentPlanCreationOperation.createArtifactType", artifact);
return artifact;
}
public static DependencyType createDependencyType(String groupId, String artifactId, String version, String type) {
-// Trace.trace("Entry", "V21DeploymentPlanCreationOperation.createDependencyType", groupId, artifactId, version, type);
+ Trace.tracePoint("Entry", "V21DeploymentPlanCreationOperation.createDependencyType", groupId, artifactId, version, type);
+
org.apache.geronimo.xml.ns.deployment_1.ObjectFactory serviceFactory = new org.apache.geronimo.xml.ns.deployment_1.ObjectFactory();
DependencyType dependency = serviceFactory.createDependencyType();
if (groupId != null)
@@ -303,13 +307,13 @@
dependency.setVersion(version);
dependency.setType(type);
-// Trace.trace("Exit", "V21DeploymentPlanCreationOperation.createDependencyType", artifact);
+ Trace.tracePoint("Exit ", "V21DeploymentPlanCreationOperation.createDependencyType", dependency);
return dependency;
}
private static boolean hasValue(String attribute) {
-// Trace.trace("Entry", "V21DeploymentPlanCreationOperation.hasValue", attribute);
-// Trace.trace("Exit", "V21DeploymentPlanCreationOperation.hasValue", (attribute != null && attribute.trim().length() != 0) );
+ Trace.tracePoint("Entry", "V21DeploymentPlanCreationOperation.hasValue", attribute);
+ Trace.tracePoint("Exit ", "V21DeploymentPlanCreationOperation.hasValue", (attribute != null && attribute.trim().length() != 0) );
return attribute != null && attribute.trim().length() != 0;
}
Modified: geronimo/devtools/eclipse-plugin/trunk/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/pom.xml?rev=638069&r1=638068&r2=638069&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/pom.xml (original)
+++ geronimo/devtools/eclipse-plugin/trunk/pom.xml Mon Mar 17 14:21:08 2008
@@ -94,22 +94,92 @@
<dependencyManagement>
<dependencies>
+
<dependency>
<groupId>com.thoughtworks.xstream</groupId>
<artifactId>xstream</artifactId>
<version>1.2.1</version>
</dependency>
+
<dependency>
<groupId>xpp3</groupId>
<artifactId>xpp3</artifactId>
<version>1.1.3.3</version>
</dependency>
+
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>3.8.1</version>
+ </dependency>
+
+ <dependency>
+ <groupId>javax.xml.bind</groupId>
+ <artifactId>jaxb-api</artifactId>
+ <version>2.0</version>
+ </dependency>
+
+ <dependency>
+ <groupId>com.sun.xml.bind</groupId>
+ <artifactId>jaxb-xjc</artifactId>
+ <version>2.0.5</version>
+ </dependency>
+
+ <dependency>
+ <groupId>com.sun.xml.bind</groupId>
+ <artifactId>jaxb-impl</artifactId>
+ <version>2.0.5</version>
+ </dependency>
+
+ <dependency>
+ <groupId>javax.activation</groupId>
+ <artifactId>activation</artifactId>
+ <version>1.1</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.codehaus.plexus</groupId>
+ <artifactId>plexus-archiver</artifactId>
+ <version>1.0-alpha-7</version>
+ </dependency>
+
+ <dependency>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ <version>1.0.4</version>
+ </dependency>
+
+ <dependency>
+ <groupId>cglib</groupId>
+ <artifactId>cglib-nodep</artifactId>
+ <version>2.1_3</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-j2ee-deployment_1.1_spec</artifactId>
+ <version>1.0</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-javaee-deployment_1.1MR3_spec</artifactId>
+ <version>1.0</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-stax-api_1.0_spec</artifactId>
+ <version>1.0.1</version>
+ </dependency>
+
</dependencies>
</dependencyManagement>
<build>
<defaultGoal>install</defaultGoal>
<sourceDirectory>src/</sourceDirectory>
+
<pluginManagement>
<plugins>
@@ -156,8 +226,15 @@
<version>2.2-beta-1</version>
</plugin>
+ <plugin>
+ <groupId>com.sun.tools.xjc.maven2</groupId>
+ <artifactId>maven-jaxb-plugin</artifactId>
+ <version>1.1</version>
+ </plugin>
+
</plugins>
</pluginManagement>
+
<plugins>
<plugin>
<artifactId>maven-compiler-plugin</artifactId>
@@ -197,6 +274,7 @@
<enabled>true</enabled>
</releases>
</repository>
+
<repository>
<id>apache.incubator</id>
<name>Apache Incubator Repository</name>
@@ -211,6 +289,7 @@
<enabled>true</enabled>
</releases>
</repository>
+
<repository>
<id>codehaus-snapshots</id>
<name>Codehaus Snapshots Repository</name>
@@ -225,10 +304,27 @@
<enabled>false</enabled>
</releases>
</repository>
+
+ <!--
+ |
+ | Added for jaxb-api, jaxb-impl, jaxb-xjc artifacts (and is the same repo used by the server)
+ |
+ -->
+ <repository>
+ <id>java.net</id>
+ <name>java.net Maven Repository</name>
+ <url>http://download.java.net/maven/1/</url>
+ <layout>legacy</layout>
+ <snapshots>
+ <enabled>false</enabled>
+ </snapshots>
+ <releases>
+ <enabled>true</enabled>
+ </releases>
+ </repository>
</repositories>
<pluginRepositories>
-
<pluginRepository>
<id>apache.org</id>
<name>Maven Plugin Snapshots</name>
@@ -253,6 +349,11 @@
</snapshots>
</pluginRepository>
+ <!--
+ |
+ | Added for maven-jaxb-plugin artifact (and is the same repo used by the server)
+ |
+ -->
<pluginRepository>
<id>java.net</id>
<name>java.net Maven Repository</name>
@@ -265,7 +366,6 @@
<enabled>true</enabled>
</releases>
</pluginRepository>
-
</pluginRepositories>
<profiles>