geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mcco...@apache.org
Subject svn commit: r641654 - in /geronimo/devtools/eclipse-plugin/trunk/plugins: org.apache.geronimo.deployment.v21.jaxbmodel/src/main/java/org/apache/geronimo/jee/openejb/ org.apache.geronimo.deployment.v21.jaxbmodel/src/main/java/org/apache/geronimo/jee/web...
Date Thu, 27 Mar 2008 00:19:57 GMT
Author: mcconne
Date: Wed Mar 26 17:19:54 2008
New Revision: 641654

URL: http://svn.apache.org/viewvc?rev=641654&view=rev
Log:
GERONIMODEVTOOLS-313 Second set of changes to use JAXB-generated classes (for svn)

Modified:
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.deployment.v21.jaxbmodel/src/main/java/org/apache/geronimo/jee/openejb/GeronimoEjbJar.java
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.deployment.v21.jaxbmodel/src/main/java/org/apache/geronimo/jee/web/WebApp.java
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.core/pom.xml
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.ui/pom.xml
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v11.ui/pom.xml
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v20.core/plugin.xml
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v20.ui/pom.xml
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.core/plugin.xml
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.core/src/main/java/org/apache/geronimo/st/v21/core/operations/V21DeploymentPlanCreationOperation.java
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.ui/pom.xml
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/sections/AppGeneralSection.java
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/sections/OpenEjbJarGeneralSection.java

Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.deployment.v21.jaxbmodel/src/main/java/org/apache/geronimo/jee/openejb/GeronimoEjbJar.java
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.deployment.v21.jaxbmodel/src/main/java/org/apache/geronimo/jee/openejb/GeronimoEjbJar.java?rev=641654&r1=641653&r2=641654&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.deployment.v21.jaxbmodel/src/main/java/org/apache/geronimo/jee/openejb/GeronimoEjbJar.java
(original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.deployment.v21.jaxbmodel/src/main/java/org/apache/geronimo/jee/openejb/GeronimoEjbJar.java
Wed Mar 26 17:19:54 2008
@@ -30,21 +30,9 @@
 import javax.xml.bind.annotation.XmlType;
 
 import org.apache.geronimo.jee.application.AbstractSecurity;
-import org.apache.geronimo.jee.deployment.AbstractService;
 import org.apache.geronimo.jee.deployment.Environment;
-import org.apache.geronimo.jee.deployment.Gbean;
-import org.apache.geronimo.jee.naming.AbstractNamingEntry;
-import org.apache.geronimo.jee.naming.EjbLocalRef;
-import org.apache.geronimo.jee.naming.EjbRef;
-import org.apache.geronimo.jee.naming.GbeanRef;
 import org.apache.geronimo.jee.naming.MessageDestination;
-import org.apache.geronimo.jee.naming.PersistenceContextRef;
-import org.apache.geronimo.jee.naming.PersistenceUnitRef;
-import org.apache.geronimo.jee.naming.ResourceEnvRef;
-import org.apache.geronimo.jee.naming.ResourceRef;
-import org.apache.geronimo.jee.naming.ServiceRef;
-
-import com.sun.java.xml.ns.persistence.Persistence;
+import org.apache.geronimo.jee.persistence.Persistence;
 
 
 /**

Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.deployment.v21.jaxbmodel/src/main/java/org/apache/geronimo/jee/web/WebApp.java
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.deployment.v21.jaxbmodel/src/main/java/org/apache/geronimo/jee/web/WebApp.java?rev=641654&r1=641653&r2=641654&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.deployment.v21.jaxbmodel/src/main/java/org/apache/geronimo/jee/web/WebApp.java
(original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.deployment.v21.jaxbmodel/src/main/java/org/apache/geronimo/jee/web/WebApp.java
Wed Mar 26 17:19:54 2008
@@ -30,10 +30,7 @@
 import javax.xml.bind.annotation.XmlType;
 
 import org.apache.geronimo.jee.application.AbstractSecurity;
-//port org.apache.geronimo.jee.application.StringType;
-//port org.apache.geronimo.jee.deployment.AbstractService;
 import org.apache.geronimo.jee.deployment.Environment;
-//port org.apache.geronimo.jee.deployment.Gbean;
 import org.apache.geronimo.jee.naming.AbstractNamingEntry;
 import org.apache.geronimo.jee.naming.EjbLocalRef;
 import org.apache.geronimo.jee.naming.EjbRef;
@@ -42,8 +39,7 @@
 import org.apache.geronimo.jee.naming.ResourceRef;
 import org.apache.geronimo.jee.naming.ResourceEnvRef;
 import org.apache.geronimo.jee.naming.ServiceRef;
-
-import com.sun.java.xml.ns.persistence.Persistence;
+import org.apache.geronimo.jee.persistence.Persistence;
 
 
 /**

Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.core/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.core/pom.xml?rev=641654&r1=641653&r2=641654&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.core/pom.xml (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.core/pom.xml Wed
Mar 26 17:19:54 2008
@@ -52,7 +52,7 @@
             </resource>
             <resource>
                 <targetPath>org/apache/geronimo/st/core/internal</targetPath>
-                <directory>src/org/apache/geronimo/st/core/internal</directory>
+                <directory>src/main/java/org/apache/geronimo/st/core/internal</directory>
                 <includes>
                     <include>Messages.properties</include>
                 </includes>

Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.ui/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.ui/pom.xml?rev=641654&r1=641653&r2=641654&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.ui/pom.xml (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.ui/pom.xml Wed Mar
26 17:19:54 2008
@@ -52,7 +52,7 @@
             </resource>
             <resource>
                 <targetPath>/org/apache/geronimo/st/ui/internal/</targetPath>
-                <directory>src/org/apache/geronimo/st/ui/internal/</directory>
+                <directory>src/main/java/org/apache/geronimo/st/ui/internal/</directory>
                 <includes>
                     <include>Messages.properties</include>
                 </includes>

Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v11.ui/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v11.ui/pom.xml?rev=641654&r1=641653&r2=641654&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v11.ui/pom.xml (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v11.ui/pom.xml Wed
Mar 26 17:19:54 2008
@@ -38,7 +38,7 @@
             </resource>
             <resource>
                 <targetPath>org/apache/geronimo/st/v11/ui/internal</targetPath>
-                <directory>src/org/apache/geronimo/st/v11/ui/internal</directory>
+                <directory>src/main/java/org/apache/geronimo/st/v11/ui/internal</directory>
                 <includes>
                     <include>Messages.properties</include>
                 </includes>

Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v20.core/plugin.xml
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v20.core/plugin.xml?rev=641654&r1=641653&r2=641654&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v20.core/plugin.xml
(original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v20.core/plugin.xml
Wed Mar 26 17:19:54 2008
@@ -93,6 +93,7 @@
                     <requires facet="jst.appclient" version="1.2"/>
                     <requires facet="jst.appclient" version="1.3"/>
                     <requires facet="jst.appclient" version="1.4"/>
+                    <requires facet="jst.appclient" version="5.0"/>
                     <requires facet="jst.connector" version="1.0"/>
                     <requires facet="jst.connector" version="1.5"/>
                     <requires facet="jst.ejb" version="1.1"/>

Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v20.ui/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v20.ui/pom.xml?rev=641654&r1=641653&r2=641654&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v20.ui/pom.xml (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v20.ui/pom.xml Wed
Mar 26 17:19:54 2008
@@ -38,7 +38,7 @@
             </resource>
             <resource>
                 <targetPath>org/apache/geronimo/st/v20/ui/internal</targetPath>
-                <directory>src/org/apache/geronimo/st/v20/ui/internal</directory>
+                <directory>src/main/java/org/apache/geronimo/st/v20/ui/internal</directory>
                 <includes>
                     <include>Messages.properties</include>
                 </includes>

Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.core/plugin.xml
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.core/plugin.xml?rev=641654&r1=641653&r2=641654&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.core/plugin.xml
(original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.core/plugin.xml
Wed Mar 26 17:19:54 2008
@@ -125,6 +125,7 @@
                     <requires facet="jst.appclient" version="1.2"/>
                     <requires facet="jst.appclient" version="1.3"/>
                     <requires facet="jst.appclient" version="1.4"/>
+                    <requires facet="jst.appclient" version="5.0"/>
                     <requires facet="jst.connector" version="1.0"/>
                     <requires facet="jst.connector" version="1.5"/>
                     <requires facet="jst.ejb" version="1.1"/>

Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.core/src/main/java/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/main/java/org/apache/geronimo/st/v21/core/operations/V21DeploymentPlanCreationOperation.java?rev=641654&r1=641653&r2=641654&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.core/src/main/java/org/apache/geronimo/st/v21/core/operations/V21DeploymentPlanCreationOperation.java
(original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.core/src/main/java/org/apache/geronimo/st/v21/core/operations/V21DeploymentPlanCreationOperation.java
Wed Mar 26 17:19:54 2008
@@ -43,9 +43,10 @@
  * 
  * <ol>
  *      <li>geronimo-application.xml
+ *      <li>geronimo-ra.xml
+ *      <li>geronimo-service.xml
  *      <li>geronimo-web.xml
  *      <li>openejb-jar.xml
- *      <li>geronimo-ra.xml
  * </ol>
  * 
  * Remaining TODO Task(s):
@@ -54,7 +55,6 @@
  *      <li>JUnit testcases
  *      <li>JAXBElement warning messages
  *      <li>How to invoke Service Deployment Plan
- *      <li>How to invoke App Client Deployment Plan
  * </ol>
  * 
  * @version $Rev: 509704 $ $Date: 2007-02-20 13:42:24 -0500 (Tue, 20 Feb 2007) $

Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.ui/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.ui/pom.xml?rev=641654&r1=641653&r2=641654&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.ui/pom.xml (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.ui/pom.xml Wed
Mar 26 17:19:54 2008
@@ -38,7 +38,7 @@
             </resource>
             <resource>
                 <targetPath>org/apache/geronimo/st/v21/ui/internal</targetPath>
-                <directory>src/org/apache/geronimo/st/v21/ui/internal</directory>
+                <directory>src/main/java/org/apache/geronimo/st/v21/ui/internal</directory>
                 <includes>
                     <include>Messages.properties</include>
                 </includes>

Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/sections/AppGeneralSection.java
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/sections/AppGeneralSection.java?rev=641654&r1=641653&r2=641654&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/sections/AppGeneralSection.java
(original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/sections/AppGeneralSection.java
Wed Mar 26 17:19:54 2008
@@ -18,17 +18,17 @@
 
 import javax.xml.bind.JAXBElement;
 
-import org.apache.geronimo.xml.ns.j2ee.application_2.ApplicationType;
+import org.apache.geronimo.jee.application.Application;
 import org.eclipse.swt.widgets.Composite;
 import org.eclipse.ui.forms.widgets.FormToolkit;
 
 public class AppGeneralSection extends CommonGeneralSection {
 
-	ApplicationType plan;
+	Application plan;
 
 	public AppGeneralSection(Composite parent, FormToolkit toolkit, int style, JAXBElement plan)
{
 		super(parent, toolkit, style, plan);
-		this.plan = (ApplicationType) plan.getValue();
+		this.plan = (Application) plan.getValue();
 		createClient();
 	}
 

Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/sections/OpenEjbJarGeneralSection.java
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/sections/OpenEjbJarGeneralSection.java?rev=641654&r1=641653&r2=641654&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/sections/OpenEjbJarGeneralSection.java
(original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.ui/src/main/java/org/apache/geronimo/st/v21/ui/sections/OpenEjbJarGeneralSection.java
Wed Mar 26 17:19:54 2008
@@ -18,17 +18,17 @@
 
 import javax.xml.bind.JAXBElement;
 
-import org.apache.geronimo.jee.openejb.OpenejbJar;
+import org.apache.geronimo.jee.openejb.GeronimoEjbJar;
 import org.eclipse.swt.widgets.Composite;
 import org.eclipse.ui.forms.widgets.FormToolkit;
 
 public class OpenEjbJarGeneralSection extends CommonGeneralSection {
 
-	OpenejbJar plan;
+	GeronimoEjbJar plan;
 
 	public OpenEjbJarGeneralSection(Composite parent, FormToolkit toolkit, int style, JAXBElement
plan) {
 		super(parent, toolkit, style, plan);
-		this.plan = (OpenejbJar) plan.getValue();
+		this.plan = (GeronimoEjbJar) plan.getValue();
 		createClient();
 	}
 



Mime
View raw message