You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by de...@apache.org on 2010/09/13 16:40:09 UTC
svn commit: r996559 [2/4] - in
/geronimo/devtools/eclipse-plugin/trunk/plugins:
org.apache.geronimo.j2ee.v11.jaxbmodel/META-INF/
org.apache.geronimo.runtime.common/
org.apache.geronimo.runtime.common/META-INF/
org.apache.geronimo.st.ui/src/main/java/or...
Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.core/src/main/java/org/apache/geronimo/st/v30/core/jaxb/JAXBObjectFactoryImpl.java
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.core/src/main/java/org/apache/geronimo/st/v30/core/jaxb/JAXBObjectFactoryImpl.java?rev=996559&r1=996558&r2=996559&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.core/src/main/java/org/apache/geronimo/st/v30/core/jaxb/JAXBObjectFactoryImpl.java (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.core/src/main/java/org/apache/geronimo/st/v30/core/jaxb/JAXBObjectFactoryImpl.java Mon Sep 13 14:40:05 2010
@@ -30,8 +30,8 @@ import org.apache.geronimo.jee.deploymen
import org.apache.geronimo.jee.deployment.Environment;
import org.apache.geronimo.jee.deployment.Gbean;
import org.apache.geronimo.jee.deployment.Reference;
-import org.apache.geronimo.jee.naming.EjbRef;
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;
@@ -39,9 +39,9 @@ import org.apache.geronimo.jee.naming.Pe
import org.apache.geronimo.jee.naming.Port;
import org.apache.geronimo.jee.naming.PortCompletion;
import org.apache.geronimo.jee.naming.Property;
-import org.apache.geronimo.jee.naming.ServiceCompletion;
import org.apache.geronimo.jee.naming.ResourceEnvRef;
import org.apache.geronimo.jee.naming.ResourceRef;
+import org.apache.geronimo.jee.naming.ServiceCompletion;
import org.apache.geronimo.jee.naming.ServiceRef;
import org.apache.geronimo.jee.openejb.EjbRelation;
import org.apache.geronimo.jee.openejb.EjbRelationshipRole;
@@ -51,9 +51,36 @@ import org.apache.geronimo.jee.security.
import org.apache.geronimo.jee.security.LoginDomainPrincipal;
import org.apache.geronimo.jee.security.Principal;
import org.apache.geronimo.jee.security.RealmPrincipal;
-import org.apache.geronimo.jee.security.RoleMappings;
import org.apache.geronimo.jee.security.Role;
+import org.apache.geronimo.jee.security.RoleMappings;
import org.apache.geronimo.jee.security.Security;
+import org.apache.geronimo.osgi.blueprint.Targument;
+import org.apache.geronimo.osgi.blueprint.Tbean;
+import org.apache.geronimo.osgi.blueprint.Tblueprint;
+import org.apache.geronimo.osgi.blueprint.Tcollection;
+import org.apache.geronimo.osgi.blueprint.Tdescription;
+import org.apache.geronimo.osgi.blueprint.TinlinedBean;
+import org.apache.geronimo.osgi.blueprint.TinlinedReference;
+import org.apache.geronimo.osgi.blueprint.TinlinedReferenceList;
+import org.apache.geronimo.osgi.blueprint.TinlinedService;
+import org.apache.geronimo.osgi.blueprint.Tinterfaces;
+import org.apache.geronimo.osgi.blueprint.Tkey;
+import org.apache.geronimo.osgi.blueprint.Tmap;
+import org.apache.geronimo.osgi.blueprint.TmapEntry;
+import org.apache.geronimo.osgi.blueprint.Tnull;
+import org.apache.geronimo.osgi.blueprint.Tprop;
+import org.apache.geronimo.osgi.blueprint.Tref;
+import org.apache.geronimo.osgi.blueprint.Treference;
+import org.apache.geronimo.osgi.blueprint.TreferenceList;
+import org.apache.geronimo.osgi.blueprint.TreferenceListener;
+import org.apache.geronimo.osgi.blueprint.Tservice;
+import org.apache.geronimo.osgi.blueprint.TserviceProperties;
+import org.apache.geronimo.osgi.blueprint.TservicePropertyEntry;
+import org.apache.geronimo.osgi.blueprint.TserviceReference;
+import org.apache.geronimo.osgi.blueprint.TserviceUse;
+import org.apache.geronimo.osgi.blueprint.TtypeConverters;
+import org.apache.geronimo.osgi.blueprint.TtypedCollection;
+import org.apache.geronimo.osgi.blueprint.Tvalue;
/**
* @version $Rev$ $Date$
@@ -163,5 +190,63 @@ public class JAXBObjectFactoryImpl imple
return null;
}
+
+ public Object createBlueprintElement(Class type) {
+ if ( type.equals( Targument.class ) ) {
+ return (new org.apache.geronimo.osgi.blueprint.ObjectFactory()).createTargument();
+ } else if ( type.equals( Tbean.class ) ) {
+ return (new org.apache.geronimo.osgi.blueprint.ObjectFactory()).createTbean();
+ } else if ( type.equals( Tblueprint.class ) ) {
+ return (new org.apache.geronimo.osgi.blueprint.ObjectFactory()).createTblueprint();
+ } else if ( type.equals( Tcollection.class ) ) {
+ return (new org.apache.geronimo.osgi.blueprint.ObjectFactory()).createTcollection();
+ } else if ( type.equals( Tdescription.class ) ) {
+ return (new org.apache.geronimo.osgi.blueprint.ObjectFactory()).createTdescription();
+ } else if ( type.equals( TinlinedBean.class ) ) {
+ return (new org.apache.geronimo.osgi.blueprint.ObjectFactory()).createTinlinedBean();
+ } else if ( type.equals( TinlinedReference.class ) ) {
+ return (new org.apache.geronimo.osgi.blueprint.ObjectFactory()).createTinlinedReference();
+ } else if ( type.equals( TinlinedReferenceList.class ) ) {
+ return (new org.apache.geronimo.osgi.blueprint.ObjectFactory()).createTinlinedReferenceList();
+ } else if ( type.equals( TinlinedService.class ) ) {
+ return (new org.apache.geronimo.osgi.blueprint.ObjectFactory()).createTinlinedService();
+ } else if ( type.equals( Tinterfaces.class ) ) {
+ return (new org.apache.geronimo.osgi.blueprint.ObjectFactory()).createTinterfaces();
+ } else if ( type.equals( Tkey.class ) ) {
+ return (new org.apache.geronimo.osgi.blueprint.ObjectFactory()).createTkey();
+ } else if ( type.equals( Tmap.class ) ) {
+ return (new org.apache.geronimo.osgi.blueprint.ObjectFactory()).createTmap();
+ } else if ( type.equals( TmapEntry.class ) ) {
+ return (new org.apache.geronimo.osgi.blueprint.ObjectFactory()).createTmapEntry();
+ } else if ( type.equals( Tnull.class ) ) {
+ return (new org.apache.geronimo.osgi.blueprint.ObjectFactory()).createTnull();
+ } else if ( type.equals( Tprop.class ) ) {
+ return (new org.apache.geronimo.osgi.blueprint.ObjectFactory()).createTprop();
+ } else if ( type.equals( Tref.class ) ) {
+ return (new org.apache.geronimo.osgi.blueprint.ObjectFactory()).createTref();
+ } else if ( type.equals( Treference.class ) ) {
+ return (new org.apache.geronimo.osgi.blueprint.ObjectFactory()).createTreference();
+ } else if ( type.equals( TreferenceList.class ) ) {
+ return (new org.apache.geronimo.osgi.blueprint.ObjectFactory()).createTreferenceList();
+ } else if ( type.equals( TreferenceListener.class ) ) {
+ return (new org.apache.geronimo.osgi.blueprint.ObjectFactory()).createTreferenceListener();
+ } else if ( type.equals( Tservice.class ) ) {
+ return (new org.apache.geronimo.osgi.blueprint.ObjectFactory()).createTservice();
+ } else if ( type.equals( TserviceProperties.class ) ) {
+ return (new org.apache.geronimo.osgi.blueprint.ObjectFactory()).createTserviceProperties();
+ } else if ( type.equals( TservicePropertyEntry.class ) ) {
+ return (new org.apache.geronimo.osgi.blueprint.ObjectFactory()).createTservicePropertyEntry();
+ } else if ( type.equals( TserviceReference.class ) ) {
+ return (new org.apache.geronimo.osgi.blueprint.ObjectFactory()).createTserviceReference();
+ } else if ( type.equals( TtypeConverters.class ) ) {
+ return (new org.apache.geronimo.osgi.blueprint.ObjectFactory()).createTtypeConverters();
+ } else if ( type.equals( TtypedCollection.class ) ) {
+ return (new org.apache.geronimo.osgi.blueprint.ObjectFactory()).createTtypedCollection();
+ } else if ( type.equals( Tvalue.class ) ) {
+ return (new org.apache.geronimo.osgi.blueprint.ObjectFactory()).createTvalue();
+ }
+
+ return null;
+ }
}
Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.core/src/main/java/org/apache/geronimo/st/v30/core/jaxb/JAXBUtilsProvider.java
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.core/src/main/java/org/apache/geronimo/st/v30/core/jaxb/JAXBUtilsProvider.java?rev=996559&r1=996558&r2=996559&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.core/src/main/java/org/apache/geronimo/st/v30/core/jaxb/JAXBUtilsProvider.java (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.core/src/main/java/org/apache/geronimo/st/v30/core/jaxb/JAXBUtilsProvider.java Mon Sep 13 14:40:05 2010
@@ -77,7 +77,10 @@ public class JAXBUtilsProvider implement
"org.apache.geronimo.jee.applicationclient:" +
"org.apache.geronimo.jee.deployment:" +
"org.apache.geronimo.jee.naming:" +
- "org.apache.geronimo.jee.security:", Activator.class.getClassLoader() );
+ "org.apache.geronimo.jee.security:" +
+ "org.apache.geronimo.jee.jaspi:" +
+ "org.apache.geronimo.osgi.blueprint:"
+ , Activator.class.getClassLoader() );
} catch (JAXBException e) {
Trace.tracePoint("JAXBException", "JAXBContext.newInstance");
e.printStackTrace();
Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.core/src/main/java/org/apache/geronimo/st/v30/core/jaxb/NamespacePrefix.java
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.core/src/main/java/org/apache/geronimo/st/v30/core/jaxb/NamespacePrefix.java?rev=996559&r1=996558&r2=996559&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.core/src/main/java/org/apache/geronimo/st/v30/core/jaxb/NamespacePrefix.java (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.core/src/main/java/org/apache/geronimo/st/v30/core/jaxb/NamespacePrefix.java Mon Sep 13 14:40:05 2010
@@ -48,6 +48,8 @@ public class NamespacePrefix extends Nam
prefixMap.put("http://geronimo.apache.org/xml/ns/security-2.0", "sec");
prefixMap.put("http://geronimo.apache.org/xml/ns/j2ee/web-2.0.1", "web");
prefixMap.put("http://geronimo.apache.org/xml/ns/loginconfig-2.0", "log");
+ prefixMap.put("http://geronimo.apache.org/xml/ns/geronimo-jaspi", "jaspi");
+ prefixMap.put("http://www.osgi.org/xmlns/blueprint/v1.0.0", "bp");
}
public static void processPrefix( Node parent ) {
Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.jaxbmodel/src/main/java/org/apache/geronimo/osgi/blueprint/Tbean.java
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.jaxbmodel/src/main/java/org/apache/geronimo/osgi/blueprint/Tbean.java?rev=996559&r1=996558&r2=996559&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.jaxbmodel/src/main/java/org/apache/geronimo/osgi/blueprint/Tbean.java (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.jaxbmodel/src/main/java/org/apache/geronimo/osgi/blueprint/Tbean.java Mon Sep 13 14:40:05 2010
@@ -74,8 +74,8 @@ public class Tbean extends Tcomponent {
protected Tdescription description;
@XmlElementRefs({
- @XmlElementRef(name = "property", namespace = "http://www.osgi.org/xmlns/blueprint/v1.0.0", type = JAXBElement.class),
- @XmlElementRef(name = "argument", namespace = "http://www.osgi.org/xmlns/blueprint/v1.0.0", type = JAXBElement.class)
+ @XmlElementRef(name = "property", namespace = "http://www.osgi.org/xmlns/blueprint/v1.0.0", type = Tproperty.class),
+ @XmlElementRef(name = "argument", namespace = "http://www.osgi.org/xmlns/blueprint/v1.0.0", type = Targument.class)
})
@XmlAnyElement(lax = true)
protected List<Object> argumentOrPropertyOrAny;
Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.jaxbmodel/src/main/java/org/apache/geronimo/osgi/blueprint/Tblueprint.java
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.jaxbmodel/src/main/java/org/apache/geronimo/osgi/blueprint/Tblueprint.java?rev=996559&r1=996558&r2=996559&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.jaxbmodel/src/main/java/org/apache/geronimo/osgi/blueprint/Tblueprint.java (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.jaxbmodel/src/main/java/org/apache/geronimo/osgi/blueprint/Tblueprint.java Mon Sep 13 14:40:05 2010
@@ -79,10 +79,10 @@ public class Tblueprint {
@XmlElement(name = "type-converters")
protected TtypeConverters typeConverters;
@XmlElementRefs({
- @XmlElementRef(name = "bean", namespace = "http://www.osgi.org/xmlns/blueprint/v1.0.0", type = JAXBElement.class),
- @XmlElementRef(name = "reference-list", namespace = "http://www.osgi.org/xmlns/blueprint/v1.0.0", type = JAXBElement.class),
- @XmlElementRef(name = "service", namespace = "http://www.osgi.org/xmlns/blueprint/v1.0.0", type = JAXBElement.class),
- @XmlElementRef(name = "reference", namespace = "http://www.osgi.org/xmlns/blueprint/v1.0.0", type = JAXBElement.class)
+ @XmlElementRef(name = "bean", namespace = "http://www.osgi.org/xmlns/blueprint/v1.0.0", type = Tbean.class),
+ @XmlElementRef(name = "reference-list", namespace = "http://www.osgi.org/xmlns/blueprint/v1.0.0", type = TreferenceList.class),
+ @XmlElementRef(name = "service", namespace = "http://www.osgi.org/xmlns/blueprint/v1.0.0", type = Tservice.class),
+ @XmlElementRef(name = "reference", namespace = "http://www.osgi.org/xmlns/blueprint/v1.0.0", type = Treference.class)
})
@XmlAnyElement(lax = true)
protected List<Object> serviceOrReferenceListOrBean;
Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.jaxbmodel/src/main/java/org/apache/geronimo/osgi/blueprint/Tcollection.java
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.jaxbmodel/src/main/java/org/apache/geronimo/osgi/blueprint/Tcollection.java?rev=996559&r1=996558&r2=996559&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.jaxbmodel/src/main/java/org/apache/geronimo/osgi/blueprint/Tcollection.java (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.jaxbmodel/src/main/java/org/apache/geronimo/osgi/blueprint/Tcollection.java Mon Sep 13 14:40:05 2010
@@ -61,19 +61,19 @@ import javax.xml.bind.annotation.XmlType
public class Tcollection extends TtypedCollection {
@XmlElementRefs({
- @XmlElementRef(name = "list", namespace = "http://www.osgi.org/xmlns/blueprint/v1.0.0", type = JAXBElement.class),
- @XmlElementRef(name = "null", namespace = "http://www.osgi.org/xmlns/blueprint/v1.0.0", type = JAXBElement.class),
- @XmlElementRef(name = "value", namespace = "http://www.osgi.org/xmlns/blueprint/v1.0.0", type = JAXBElement.class),
- @XmlElementRef(name = "service", namespace = "http://www.osgi.org/xmlns/blueprint/v1.0.0", type = JAXBElement.class),
- @XmlElementRef(name = "array", namespace = "http://www.osgi.org/xmlns/blueprint/v1.0.0", type = JAXBElement.class),
- @XmlElementRef(name = "reference", namespace = "http://www.osgi.org/xmlns/blueprint/v1.0.0", type = JAXBElement.class),
- @XmlElementRef(name = "idref", namespace = "http://www.osgi.org/xmlns/blueprint/v1.0.0", type = JAXBElement.class),
- @XmlElementRef(name = "bean", namespace = "http://www.osgi.org/xmlns/blueprint/v1.0.0", type = JAXBElement.class),
- @XmlElementRef(name = "props", namespace = "http://www.osgi.org/xmlns/blueprint/v1.0.0", type = JAXBElement.class),
- @XmlElementRef(name = "map", namespace = "http://www.osgi.org/xmlns/blueprint/v1.0.0", type = JAXBElement.class),
- @XmlElementRef(name = "ref", namespace = "http://www.osgi.org/xmlns/blueprint/v1.0.0", type = JAXBElement.class),
- @XmlElementRef(name = "set", namespace = "http://www.osgi.org/xmlns/blueprint/v1.0.0", type = JAXBElement.class),
- @XmlElementRef(name = "reference-list", namespace = "http://www.osgi.org/xmlns/blueprint/v1.0.0", type = JAXBElement.class)
+ @XmlElementRef(name = "list", namespace = "http://www.osgi.org/xmlns/blueprint/v1.0.0", type = Tcollection.class),
+ @XmlElementRef(name = "null", namespace = "http://www.osgi.org/xmlns/blueprint/v1.0.0", type = Tnull.class),
+ @XmlElementRef(name = "value", namespace = "http://www.osgi.org/xmlns/blueprint/v1.0.0", type = Tvalue.class),
+ @XmlElementRef(name = "service", namespace = "http://www.osgi.org/xmlns/blueprint/v1.0.0", type = Tservice.class),
+ @XmlElementRef(name = "array", namespace = "http://www.osgi.org/xmlns/blueprint/v1.0.0", type = Tcollection.class),
+ @XmlElementRef(name = "reference", namespace = "http://www.osgi.org/xmlns/blueprint/v1.0.0", type = Treference.class),
+ @XmlElementRef(name = "idref", namespace = "http://www.osgi.org/xmlns/blueprint/v1.0.0", type = Tref.class),
+ @XmlElementRef(name = "bean", namespace = "http://www.osgi.org/xmlns/blueprint/v1.0.0", type = Tbean.class),
+ @XmlElementRef(name = "props", namespace = "http://www.osgi.org/xmlns/blueprint/v1.0.0", type = Tprops.class),
+ @XmlElementRef(name = "map", namespace = "http://www.osgi.org/xmlns/blueprint/v1.0.0", type = Tmap.class),
+ @XmlElementRef(name = "ref", namespace = "http://www.osgi.org/xmlns/blueprint/v1.0.0", type = Tref.class),
+ @XmlElementRef(name = "set", namespace = "http://www.osgi.org/xmlns/blueprint/v1.0.0", type = Tcollection.class),
+ @XmlElementRef(name = "reference-list", namespace = "http://www.osgi.org/xmlns/blueprint/v1.0.0", type = TreferenceList.class)
})
@XmlAnyElement(lax = true)
protected List<Object> gvalue;
Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.jaxbmodel/src/main/java/org/apache/geronimo/osgi/blueprint/Tinterfaces.java
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.jaxbmodel/src/main/java/org/apache/geronimo/osgi/blueprint/Tinterfaces.java?rev=996559&r1=996558&r2=996559&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.jaxbmodel/src/main/java/org/apache/geronimo/osgi/blueprint/Tinterfaces.java (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.jaxbmodel/src/main/java/org/apache/geronimo/osgi/blueprint/Tinterfaces.java Mon Sep 13 14:40:05 2010
@@ -59,7 +59,7 @@ import javax.xml.bind.annotation.XmlType
@XmlRootElement(name = "interfaces")
public class Tinterfaces {
- @XmlElementRef(name = "value", namespace = "http://www.osgi.org/xmlns/blueprint/v1.0.0", type = JAXBElement.class)
+ @XmlElementRef(name = "value", namespace = "http://www.osgi.org/xmlns/blueprint/v1.0.0", type = Tvalue.class)
protected List<JAXBElement<String>> value;
/**
Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.jaxbmodel/src/main/java/org/apache/geronimo/osgi/blueprint/TtypeConverters.java
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.jaxbmodel/src/main/java/org/apache/geronimo/osgi/blueprint/TtypeConverters.java?rev=996559&r1=996558&r2=996559&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.jaxbmodel/src/main/java/org/apache/geronimo/osgi/blueprint/TtypeConverters.java (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.jaxbmodel/src/main/java/org/apache/geronimo/osgi/blueprint/TtypeConverters.java Mon Sep 13 14:40:05 2010
@@ -67,12 +67,12 @@ import javax.xml.bind.annotation.XmlType
public class TtypeConverters {
@XmlElementRefs({
- @XmlElementRef(name = "bean", namespace = "http://www.osgi.org/xmlns/blueprint/v1.0.0", type = JAXBElement.class),
- @XmlElementRef(name = "reference", namespace = "http://www.osgi.org/xmlns/blueprint/v1.0.0", type = JAXBElement.class),
- @XmlElementRef(name = "ref", namespace = "http://www.osgi.org/xmlns/blueprint/v1.0.0", type = JAXBElement.class)
+ @XmlElementRef(name = "bean", namespace = "http://www.osgi.org/xmlns/blueprint/v1.0.0", type = Tbean.class),
+ @XmlElementRef(name = "reference", namespace = "http://www.osgi.org/xmlns/blueprint/v1.0.0", type = Treference.class),
+ @XmlElementRef(name = "ref", namespace = "http://www.osgi.org/xmlns/blueprint/v1.0.0", type = Tref.class)
})
@XmlAnyElement(lax = true)
- protected List<Object> beanOrReferenceOrRef;
+ protected List<Tcomponent> beanOrReferenceOrRef;
/**
* Gets the value of the beanOrReferenceOrRef property.
@@ -99,9 +99,9 @@ public class TtypeConverters {
*
*
*/
- public List<Object> getBeanOrReferenceOrRef() {
+ public List<Tcomponent> getBeanOrReferenceOrRef() {
if (beanOrReferenceOrRef == null) {
- beanOrReferenceOrRef = new ArrayList<Object>();
+ beanOrReferenceOrRef = new ArrayList<Tcomponent>();
}
return this.beanOrReferenceOrRef;
}
Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.ui/META-INF/MANIFEST.MF
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.ui/META-INF/MANIFEST.MF?rev=996559&r1=996558&r2=996559&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.ui/META-INF/MANIFEST.MF (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.ui/META-INF/MANIFEST.MF Mon Sep 13 14:40:05 2010
@@ -6,9 +6,10 @@ Bundle-Version: 3.0.0
Bundle-Activator: org.apache.geronimo.st.v30.ui.Activator
Bundle-Localization: plugin
Require-Bundle:
- org.apache.geronimo.jee.v21.jaxbmodel,
- org.apache.geronimo.st.v30.jaxbmodel,
org.apache.geronimo.runtime.v30,
+ org.apache.geronimo.jee.v21.jaxbmodel,
+ org.apache.geronimo.jee.v22.jaxbmodel,
+ org.apache.geronimo.st.v30.jaxbmodel,
org.apache.geronimo.st.v30.core,
org.apache.geronimo.st.ui,
org.eclipse.core.filebuffers,
Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.ui/plugin.xml
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.ui/plugin.xml?rev=996559&r1=996558&r2=996559&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.ui/plugin.xml (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.ui/plugin.xml Mon Sep 13 14:40:05 2010
@@ -265,18 +265,12 @@
###################################################################################################################
-->
<extension point="org.eclipse.ui.editors">
- <editor class="org.eclipse.wst.xml.ui.internal.tabletree.XMLMultiPageEditorPart"
- contributorClass="org.eclipse.wst.xml.ui.internal.tabletree.XMLMultiPageEditorActionBarContributor"
- symbolicFontName="org.eclipse.wst.sse.ui.textfont"
+ <editor class="org.apache.geronimo.st.v30.ui.editors.BlueprintFormEditor"
default="true"
filenames="blueprint.xml"
icon="icons/obj16/littleOSGi.gif"
id="org.apache.geronimo.v30.ui.editors.BlueprintFormEditor"
name="%BlueprintEditorName">
- <contentTypeBinding
- contentTypeId="org.eclipse.core.runtime.xml"/>
- <contentTypeBinding
- contentTypeId="org.eclipse.wst.xml.core.xmlsource"/>
</editor>
</extension>
Added: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.ui/src/main/java/org/apache/geronimo/st/v30/ui/BlueprintEditorUIHelper.java
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.ui/src/main/java/org/apache/geronimo/st/v30/ui/BlueprintEditorUIHelper.java?rev=996559&view=auto
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.ui/src/main/java/org/apache/geronimo/st/v30/ui/BlueprintEditorUIHelper.java (added)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.ui/src/main/java/org/apache/geronimo/st/v30/ui/BlueprintEditorUIHelper.java Mon Sep 13 14:40:05 2010
@@ -0,0 +1,36 @@
+package org.apache.geronimo.st.v30.ui;
+
+import javax.xml.bind.JAXBElement;
+
+import org.apache.geronimo.osgi.blueprint.ObjectFactory;
+import org.apache.geronimo.osgi.blueprint.Tblueprint;
+
+public class BlueprintEditorUIHelper {
+
+ private static ObjectFactory blueprintObjectFactory ;
+
+ public static Tblueprint getBlueprint(JAXBElement root ){
+
+ if (root!=null){
+ Object rootObject = root.getValue();
+ if (Tblueprint.class.isInstance(rootObject)){
+ return (Tblueprint)rootObject;
+ }
+
+ }
+ return null;
+ //Otherwise, create a new root element
+// Tblueprint tbluePrint = getBlueprintObjectFactory().createTblueprint();
+// blueprint = getBlueprintObjectFactory().createBlueprint(tbluePrint);
+// markDirty();
+// return tbluePrint;
+ }
+
+ public static ObjectFactory getBlueprintObjectFactory() {
+ if ( blueprintObjectFactory == null ) {
+ blueprintObjectFactory = new ObjectFactory();
+ }
+ return blueprintObjectFactory;
+ }
+
+}
Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.ui/src/main/java/org/apache/geronimo/st/v30/ui/editors/BlueprintFormEditor.java
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.ui/src/main/java/org/apache/geronimo/st/v30/ui/editors/BlueprintFormEditor.java?rev=996559&r1=996558&r2=996559&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.ui/src/main/java/org/apache/geronimo/st/v30/ui/editors/BlueprintFormEditor.java (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.ui/src/main/java/org/apache/geronimo/st/v30/ui/editors/BlueprintFormEditor.java Mon Sep 13 14:40:05 2010
@@ -16,80 +16,56 @@
*/
package org.apache.geronimo.st.v30.ui.editors;
-import org.apache.geronimo.st.v30.ui.internal.Trace;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.ui.forms.editor.FormEditor;
+import javax.xml.bind.JAXBElement;
+
+import org.apache.geronimo.st.ui.editors.AbstractGeronimoJAXBBasedEditor;
+import org.apache.geronimo.st.v30.core.jaxb.JAXBUtils;
+import org.apache.geronimo.st.v30.ui.CommonMessages;
+import org.apache.geronimo.st.v30.ui.pages.blueprint.BlueprintPage;
+import org.eclipse.core.resources.IFile;
import org.eclipse.ui.PartInitException;
/**
* @version $Rev$ $Date$
*/
-public class BlueprintFormEditor extends FormEditor {
-
- public BlueprintFormEditor() {
- super();
+public class BlueprintFormEditor extends AbstractGeronimoJAXBBasedEditor {
+
+ private static String BLUEPRINT_NAME = "blueprint.xml";
+
+ private JAXBElement blueprint ;
+
+ @Override
+ public void doAddPages() throws PartInitException {
+
+ addFormPages();
- Trace.tracePoint("Entry", "BlueprintFormEditor.BlueprintFormEditor");
+ //add source page
+ addSourcePage();
- // TODO
-
- Trace.tracePoint("Exit", "BlueprintFormEditor.BlueprintFormEditor");
}
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.ui.forms.editor.FormEditor#addPages()
- */
- public void addPages() {
- Trace.tracePoint("Entry", "BlueprintFormEditor.addPages");
+ private void addFormPages() throws PartInitException {
+ //add General page
+ this.addPage(new BlueprintPage(this, "blueprintgeneralpage", CommonMessages.editorTabGeneral));
- // TODO
-
- Trace.tracePoint("Exit", "BlueprintFormEditor.addPages");
}
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.ui.part.EditorPart#isSaveAsAllowed()
- */
- public boolean isSaveAsAllowed() {
- Trace.tracePoint("Entry", "BlueprintFormEditor.isSaveAsAllowed");
-
- // TODO
-
- Trace.tracePoint("Exit", "BlueprintFormEditor.isSaveAsAllowed, false");
- return false;
+ @Override
+ public JAXBElement loadFile(IFile file) throws Exception {
+ if (file.getName().equals(BLUEPRINT_NAME) && file.exists()) {
+ blueprint = JAXBUtils.unmarshalFilterDeploymentPlan(file);
+ return blueprint;
+ }else return null;
}
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.ui.part.EditorPart#doSaveAs()
- */
- public final void doSaveAs() {
- Trace.tracePoint("Entry", "BlueprintFormEditor.doSaveAs");
-
- // TODO
+ @Override
+ public void saveFile(IFile file) throws Exception {
+ JAXBUtils.marshalDeploymentPlan(blueprint, file);
- Trace.tracePoint("Exit", "BlueprintFormEditor.doSaveAs");
}
+
+
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.ui.part.EditorPart#doSave(org.eclipse.core.runtime.IProgressMonitor)
- */
- public void doSave(IProgressMonitor monitor) {
- Trace.tracePoint("Entry", "BlueprintFormEditor.doSave", monitor);
-
- // TODO
-
- Trace.tracePoint("Exit", "BlueprintFormEditor.doSave");
- }
+
}
Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.ui/src/main/java/org/apache/geronimo/st/v30/ui/editors/GeronimoFormContentLoader.java
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.ui/src/main/java/org/apache/geronimo/st/v30/ui/editors/GeronimoFormContentLoader.java?rev=996559&r1=996558&r2=996559&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.ui/src/main/java/org/apache/geronimo/st/v30/ui/editors/GeronimoFormContentLoader.java (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.ui/src/main/java/org/apache/geronimo/st/v30/ui/editors/GeronimoFormContentLoader.java Mon Sep 13 14:40:05 2010
@@ -18,7 +18,7 @@ package org.apache.geronimo.st.v30.ui.ed
import javax.xml.bind.JAXBElement;
-import org.apache.geronimo.st.ui.editors.AbstractGeronimoDeploymentPlanEditor;
+import org.apache.geronimo.st.ui.editors.AbstractGeronimoJAXBBasedEditor;
import org.apache.geronimo.st.v30.core.GeronimoServerInfo;
import org.apache.geronimo.st.v30.core.GeronimoUtils;
import org.apache.geronimo.st.v30.core.jaxb.JAXBUtils;
@@ -94,8 +94,8 @@ public class GeronimoFormContentLoader e
* @see org.apache.geronimo.st.v30.ui.editors.AbstractGeronimoFormContentLoader#addWebPlanPages()
*/
public void addWebPlanPages(FormEditor editor) throws PartInitException {
- AbstractGeronimoDeploymentPlanEditor geronimoEditor = (AbstractGeronimoDeploymentPlanEditor)editor;
- JAXBElement plan = geronimoEditor.getDeploymentPlan();
+ AbstractGeronimoJAXBBasedEditor geronimoEditor = (AbstractGeronimoJAXBBasedEditor)editor;
+ JAXBElement plan = geronimoEditor.getRootElement();
editor.addPage(new WebGeneralPage(editor, "generalpage", CommonMessages.editorTabGeneral));
editor.addPage(createNamingFormPage(editor));
editor.addPage(new SecurityPage(editor, "securitypage", CommonMessages.editorTabSecurity));
Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.ui/src/main/java/org/apache/geronimo/st/v30/ui/internal/Messages.java
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.ui/src/main/java/org/apache/geronimo/st/v30/ui/internal/Messages.java?rev=996559&r1=996558&r2=996559&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.ui/src/main/java/org/apache/geronimo/st/v30/ui/internal/Messages.java (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.ui/src/main/java/org/apache/geronimo/st/v30/ui/internal/Messages.java Mon Sep 13 14:40:05 2010
@@ -541,4 +541,27 @@ public class Messages extends NLS {
public static String installable;
public static String event;
public static String prerequisites;
+
+ //for blueprint editor
+ public static String editorTabService;
+ public static String editorTabReferenceList;
+ public static String editorTabBean;
+ public static String editorTabReference;
+
+ public static String blueprintGeneralPageTitle;
+ public static String blueprintAttributeSectionTitle;
+ public static String defaultActivation;
+ public static String defaultTimeout;
+ public static String defaultAvailability;
+
+ public static String blueprintOtherElementsSection;
+ public static String blueprintOtherElementsSectionDescription;
+
+ public static String blueprintAttributeSectionDescription;
+ public static String blueprintDescriptionSectionTitle;
+ public static String blueprintDescriptionSectionDescription;
+
+ public static String blueprintTypeConverterSectionTitle;
+ public static String blueprintTypeConverterSectionDescription;
+
}
Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.ui/src/main/java/org/apache/geronimo/st/v30/ui/internal/Messages.properties
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.ui/src/main/java/org/apache/geronimo/st/v30/ui/internal/Messages.properties?rev=996559&r1=996558&r2=996559&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.ui/src/main/java/org/apache/geronimo/st/v30/ui/internal/Messages.properties (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.ui/src/main/java/org/apache/geronimo/st/v30/ui/internal/Messages.properties Mon Sep 13 14:40:05 2010
@@ -418,7 +418,7 @@ specifyPorts=Specify the configured port
portName=Port Name
portValue=Port Value
-editorCorrect=There was an error opening the editor. The elements in the plan may not be qualified, do you want to try to auto-correct this? Otherwise the default text editor will be opened.
+editorCorrect=There was an error opening the editor. The elements in the file may not be qualified, do you want to try to auto-correct this? Otherwise the default text editor will be opened.
editorDefault=Could not load the deployment plan. Opening default text editor.
serverNotStarted=Server has not been started. Please start the server and retry the action.
errorOpenDialog=Error opening editor.
@@ -539,5 +539,25 @@ driverGroup=Driver Details
basicGroup=Basic Settings
advancedGroup=Advanced Settings
+#for blueprint editor
+editorTabService=Service
+editorTabReferenceList=Reference List
+editorTabBean=Bean
+editorTabReference=Reference
+blueprintGeneralPageTitle = Blueprint General Configuration
+blueprintAttributeSectionTitle = Blueprint Attributes Configuration
+blueprintAttributeSectionDescription = Specify default attributes of blueprint
+blueprintDescriptionSectionTitle = Description
+blueprintDescriptionSectionDescription = The description for blueprint
+defaultActivation = Default Activation
+defaultTimeout = Default Timeout
+defaultAvailability = Default Availability
+blueprintTypeConverterSectionTitle = Type-Converters List
+blueprintTypeConverterSectionDescription = Specify configuration for type-converters
+
+blueprintOtherElementsSection = Blueprint Bean, Service, Reference List, Reference configuration
+blueprintOtherElementsSectionDescription = Specify other children elements of blueprint
+
+
Added: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.ui/src/main/java/org/apache/geronimo/st/v30/ui/pages/AbstractDeploymentPlanFormPage.java
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.ui/src/main/java/org/apache/geronimo/st/v30/ui/pages/AbstractDeploymentPlanFormPage.java?rev=996559&view=auto
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.ui/src/main/java/org/apache/geronimo/st/v30/ui/pages/AbstractDeploymentPlanFormPage.java (added)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.ui/src/main/java/org/apache/geronimo/st/v30/ui/pages/AbstractDeploymentPlanFormPage.java Mon Sep 13 14:40:05 2010
@@ -0,0 +1,87 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.geronimo.st.v30.ui.pages;
+
+import org.apache.geronimo.st.v30.core.DeploymentDescriptorUtils;
+import org.apache.geronimo.st.v30.core.GeronimoServerInfo;
+import org.apache.geronimo.st.v30.core.descriptor.AbstractDeploymentDescriptor;
+import org.eclipse.swt.widgets.Control;
+import org.eclipse.ui.forms.IManagedForm;
+import org.eclipse.ui.forms.editor.FormEditor;
+
+/**
+ * @version $Rev: 939152 $ $Date: 2010-04-29 08:57:12 +0800 (Thu, 29 Apr 2010) $
+ */
+public abstract class AbstractDeploymentPlanFormPage extends AbstractGeronimoFormPage {
+
+
+ AbstractDeploymentDescriptor deploymentDescriptor;
+
+ /**
+ * @param editor
+ * @param id
+ * @param title
+ */
+ public AbstractDeploymentPlanFormPage(FormEditor editor, String id, String title) {
+ super(editor, id, title);
+ }
+
+ /**
+ * @param id
+ * @param title
+ */
+ public AbstractDeploymentPlanFormPage(String id, String title) {
+ super(id, title);
+ }
+
+ public void refresh() {
+ // clear the old composite and tool bar
+ Control[] controls = body.getChildren();
+ for (int i = 0; i < controls.length; i++) {
+ controls[i].dispose();
+ }
+ getManagedForm().getForm().getToolBarManager().removeAll();
+ createFormContent(getManagedForm());
+ }
+
+ /*
+ * (non-Javadoc)
+ *
+ * @see org.eclipse.ui.forms.editor.FormPage#createFormContent(org.eclipse.ui.forms.IManagedForm)
+ */
+ protected void createFormContent(IManagedForm managedForm) {
+ deploymentDescriptor = (AbstractDeploymentDescriptor) DeploymentDescriptorUtils
+ .getDeploymentDescriptor(getProject());
+
+ super.createFormContent(managedForm);
+
+ }
+
+ protected void triggerGeronimoServerInfoUpdate(){
+ GeronimoServerInfo.getInstance().updateInfo();
+ }
+
+ protected String getHelpResource() {
+ return "http://geronimo.apache.org/development-tools.html";
+ }
+
+
+ public AbstractDeploymentDescriptor getDeploymentDescriptor() {
+ return deploymentDescriptor;
+ }
+
+}
Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.ui/src/main/java/org/apache/geronimo/st/v30/ui/pages/AbstractGeronimoFormPage.java
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.ui/src/main/java/org/apache/geronimo/st/v30/ui/pages/AbstractGeronimoFormPage.java?rev=996559&r1=996558&r2=996559&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.ui/src/main/java/org/apache/geronimo/st/v30/ui/pages/AbstractGeronimoFormPage.java (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.ui/src/main/java/org/apache/geronimo/st/v30/ui/pages/AbstractGeronimoFormPage.java Mon Sep 13 14:40:05 2010
@@ -18,10 +18,8 @@ package org.apache.geronimo.st.v30.ui.pa
import javax.xml.bind.JAXBElement;
-import org.apache.geronimo.st.v30.core.DeploymentDescriptorUtils;
-import org.apache.geronimo.st.v30.core.descriptor.AbstractDeploymentDescriptor;
+import org.apache.geronimo.st.ui.editors.AbstractGeronimoJAXBBasedEditor;
import org.apache.geronimo.st.v30.ui.Activator;
-import org.apache.geronimo.st.ui.editors.AbstractGeronimoDeploymentPlanEditor;
import org.eclipse.core.resources.IProject;
import org.eclipse.jface.action.Action;
import org.eclipse.jface.action.IToolBarManager;
@@ -45,10 +43,8 @@ import org.eclipse.ui.forms.widgets.Sect
*/
public abstract class AbstractGeronimoFormPage extends FormPage {
- JAXBElement deploymentPlan;
+ protected JAXBElement rootElement;
- AbstractDeploymentDescriptor deploymentDescriptor;
-
protected FormToolkit toolkit;
protected Composite body;
@@ -86,9 +82,7 @@ public abstract class AbstractGeronimoFo
* @see org.eclipse.ui.forms.editor.FormPage#createFormContent(org.eclipse.ui.forms.IManagedForm)
*/
protected void createFormContent(IManagedForm managedForm) {
- deploymentPlan = ((AbstractGeronimoDeploymentPlanEditor) getEditor()).getDeploymentPlan();
- deploymentDescriptor = (AbstractDeploymentDescriptor) DeploymentDescriptorUtils
- .getDeploymentDescriptor(getProject());
+ rootElement = ((AbstractGeronimoJAXBBasedEditor) getEditor()).getRootElement();
body = managedForm.getForm().getBody();
toolkit = managedForm.getToolkit();
final ScrolledForm form = managedForm.getForm();
@@ -156,8 +150,8 @@ public abstract class AbstractGeronimoFo
abstract protected void fillBody(IManagedForm managedForm);
- public JAXBElement getDeploymentPlan() {
- return deploymentPlan;
+ public JAXBElement getRootElement() {
+ return rootElement;
}
protected IProject getProject() {
@@ -168,10 +162,6 @@ public abstract class AbstractGeronimoFo
return null;
}
- public AbstractDeploymentDescriptor getDeploymentDescriptor() {
- return deploymentDescriptor;
- }
-
public String getFormTitle() {
return getTitle();
}
Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.ui/src/main/java/org/apache/geronimo/st/v30/ui/pages/AppClientGeneralPage.java
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.ui/src/main/java/org/apache/geronimo/st/v30/ui/pages/AppClientGeneralPage.java?rev=996559&r1=996558&r2=996559&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.ui/src/main/java/org/apache/geronimo/st/v30/ui/pages/AppClientGeneralPage.java (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.ui/src/main/java/org/apache/geronimo/st/v30/ui/pages/AppClientGeneralPage.java Mon Sep 13 14:40:05 2010
@@ -27,7 +27,7 @@ import org.eclipse.ui.forms.editor.FormE
/**
* @version $Rev$ $Date$
*/
-public class AppClientGeneralPage extends AbstractGeronimoFormPage {
+public class AppClientGeneralPage extends AbstractDeploymentPlanFormPage {
public AppClientGeneralPage(FormEditor editor, String id, String title) {
super(editor, id, title);
@@ -39,8 +39,8 @@ public class AppClientGeneralPage extend
* @see org.apache.geronimo.ui.pages.AbstractGeronimoFormPage#fillBody(org.eclipse.ui.forms.IManagedForm)
*/
protected void fillBody(IManagedForm managedForm) {
- managedForm.addPart(new AppClientClientGeneralSection(body, toolkit, getStyle(), getDeploymentPlan()));
- managedForm.addPart(new AppClientServerGeneralSection(body, toolkit, getStyle(), getDeploymentPlan()));
+ managedForm.addPart(new AppClientClientGeneralSection(body, toolkit, getStyle(), getRootElement()));
+ managedForm.addPart(new AppClientServerGeneralSection(body, toolkit, getStyle(), getRootElement()));
}
/*
@@ -52,9 +52,5 @@ public class AppClientGeneralPage extend
return CommonMessages.appClientGeneralPageTitle;
}
- @Override
- protected void triggerGeronimoServerInfoUpdate() {
- GeronimoServerInfo.getInstance().updateInfo();
- }
}
Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.ui/src/main/java/org/apache/geronimo/st/v30/ui/pages/AppClientSecurityPage.java
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.ui/src/main/java/org/apache/geronimo/st/v30/ui/pages/AppClientSecurityPage.java?rev=996559&r1=996558&r2=996559&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.ui/src/main/java/org/apache/geronimo/st/v30/ui/pages/AppClientSecurityPage.java (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.ui/src/main/java/org/apache/geronimo/st/v30/ui/pages/AppClientSecurityPage.java Mon Sep 13 14:40:05 2010
@@ -27,7 +27,7 @@ import org.eclipse.ui.forms.editor.FormE
/**
* @version $Rev$ $Date$
*/
-public class AppClientSecurityPage extends AbstractGeronimoFormPage {
+public class AppClientSecurityPage extends AbstractDeploymentPlanFormPage {
public AppClientSecurityPage(FormEditor editor, String id, String title) {
super(editor, id, title);
@@ -39,7 +39,7 @@ public class AppClientSecurityPage exten
* @see org.apache.geronimo.ui.pages.AbstractGeronimoFormPage#fillBody(org.eclipse.ui.forms.IManagedForm)
*/
protected void fillBody(IManagedForm managedForm) {
- managedForm.addPart(new AppClientSecuritySection(body, toolkit, getStyle(), getDeploymentPlan()));
+ managedForm.addPart(new AppClientSecuritySection(body, toolkit, getStyle(), getRootElement()));
}
/*
@@ -62,9 +62,5 @@ public class AppClientSecurityPage exten
return CommonMessages.securityPageTitle;
}
- @Override
- protected void triggerGeronimoServerInfoUpdate() {
- GeronimoServerInfo.getInstance().updateInfo();
- }
}
Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.ui/src/main/java/org/apache/geronimo/st/v30/ui/pages/AppGeneralPage.java
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.ui/src/main/java/org/apache/geronimo/st/v30/ui/pages/AppGeneralPage.java?rev=996559&r1=996558&r2=996559&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.ui/src/main/java/org/apache/geronimo/st/v30/ui/pages/AppGeneralPage.java (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.ui/src/main/java/org/apache/geronimo/st/v30/ui/pages/AppGeneralPage.java Mon Sep 13 14:40:05 2010
@@ -26,7 +26,7 @@ import org.eclipse.ui.forms.editor.FormE
/**
* @version $Rev$ $Date$
*/
-public class AppGeneralPage extends AbstractGeronimoFormPage {
+public class AppGeneralPage extends AbstractDeploymentPlanFormPage {
public AppGeneralPage(FormEditor editor, String id, String title) {
super(editor, id, title);
@@ -38,7 +38,7 @@ public class AppGeneralPage extends Abst
* @see org.apache.geronimo.ui.pages.AbstractGeronimoFormPage#fillBody(org.eclipse.ui.forms.IManagedForm)
*/
protected void fillBody(IManagedForm managedForm) {
- managedForm.addPart(new AppGeneralSection(body, toolkit, getStyle(), getDeploymentPlan()));
+ managedForm.addPart(new AppGeneralSection(body, toolkit, getStyle(), getRootElement()));
}
/*
@@ -50,9 +50,5 @@ public class AppGeneralPage extends Abst
return CommonMessages.appGeneralPageTitle;
}
- @Override
- protected void triggerGeronimoServerInfoUpdate() {
- GeronimoServerInfo.getInstance().updateInfo();
- }
}
Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.ui/src/main/java/org/apache/geronimo/st/v30/ui/pages/ConnectorOverviewPage.java
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.ui/src/main/java/org/apache/geronimo/st/v30/ui/pages/ConnectorOverviewPage.java?rev=996559&r1=996558&r2=996559&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.ui/src/main/java/org/apache/geronimo/st/v30/ui/pages/ConnectorOverviewPage.java (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.ui/src/main/java/org/apache/geronimo/st/v30/ui/pages/ConnectorOverviewPage.java Mon Sep 13 14:40:05 2010
@@ -26,7 +26,7 @@ import org.eclipse.ui.forms.editor.FormE
/**
* @version $Rev$ $Date$
*/
-public class ConnectorOverviewPage extends AbstractGeronimoFormPage {
+public class ConnectorOverviewPage extends AbstractDeploymentPlanFormPage {
public ConnectorOverviewPage(FormEditor editor, String id, String title) {
super(editor, id, title);
@@ -38,7 +38,7 @@ public class ConnectorOverviewPage exten
* @see org.apache.geronimo.ui.pages.AbstractGeronimoFormPage#fillBody(org.eclipse.ui.forms.IManagedForm)
*/
protected void fillBody(IManagedForm managedForm) {
- managedForm.addPart(new ConnectorGeneralSection(body, toolkit, getStyle(), getDeploymentPlan()));
+ managedForm.addPart(new ConnectorGeneralSection(body, toolkit, getStyle(), getRootElement()));
}
/*
@@ -50,9 +50,5 @@ public class ConnectorOverviewPage exten
return CommonMessages.connectorOverViewPageTitle;
}
- @Override
- protected void triggerGeronimoServerInfoUpdate() {
- GeronimoServerInfo.getInstance().updateInfo();
- }
}
Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.ui/src/main/java/org/apache/geronimo/st/v30/ui/pages/ConnectorPage.java
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.ui/src/main/java/org/apache/geronimo/st/v30/ui/pages/ConnectorPage.java?rev=996559&r1=996558&r2=996559&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.ui/src/main/java/org/apache/geronimo/st/v30/ui/pages/ConnectorPage.java (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.ui/src/main/java/org/apache/geronimo/st/v30/ui/pages/ConnectorPage.java Mon Sep 13 14:40:05 2010
@@ -17,13 +17,8 @@
package org.apache.geronimo.st.v30.ui.pages;
import org.apache.geronimo.jee.application.Application;
-import org.apache.geronimo.st.v30.ui.CommonMessages;
-import org.apache.geronimo.st.ui.editors.AbstractGeronimoDeploymentPlanEditor;
-import org.apache.geronimo.st.v30.ui.pages.AbstractGeronimoFormPage;
-
-import org.apache.geronimo.st.v30.core.GeronimoServerInfo;
+import org.apache.geronimo.st.ui.editors.AbstractGeronimoJAXBBasedEditor;
import org.apache.geronimo.st.v30.ui.sections.DBPoolSection;
-
import org.eclipse.swt.layout.GridLayout;
import org.eclipse.ui.forms.IManagedForm;
import org.eclipse.ui.forms.editor.FormEditor;
@@ -33,7 +28,7 @@ import org.eclipse.ui.forms.editor.FormE
* geronimo-application.xml,geronimo-web.xml,openejb-jar.xml It will contain two
* sections,Database pool section and JMS resource section
*/
-public class ConnectorPage extends AbstractGeronimoFormPage {
+public class ConnectorPage extends AbstractDeploymentPlanFormPage {
public ConnectorPage(FormEditor editor, String id, String title) {
super(editor, id, title);
@@ -41,9 +36,9 @@ public class ConnectorPage extends Abstr
@Override
protected void fillBody(IManagedForm managedForm) {
- Application application = (Application) ((AbstractGeronimoDeploymentPlanEditor) getEditor())
- .getDeploymentPlan().getValue();
- managedForm.addPart(new DBPoolSection(getDeploymentPlan(), body,
+ Application application = (Application) ((AbstractGeronimoJAXBBasedEditor) getEditor())
+ .getRootElement().getValue();
+ managedForm.addPart(new DBPoolSection(getRootElement(), body,
toolkit, getStyle(), application.getExtModule()));
}
@@ -57,9 +52,5 @@ public class ConnectorPage extends Abstr
return "Connector";//TODO
}
- @Override
- protected void triggerGeronimoServerInfoUpdate() {
- GeronimoServerInfo.getInstance().updateInfo();
- }
}
Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.ui/src/main/java/org/apache/geronimo/st/v30/ui/pages/DeploymentPage.java
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.ui/src/main/java/org/apache/geronimo/st/v30/ui/pages/DeploymentPage.java?rev=996559&r1=996558&r2=996559&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.ui/src/main/java/org/apache/geronimo/st/v30/ui/pages/DeploymentPage.java (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.ui/src/main/java/org/apache/geronimo/st/v30/ui/pages/DeploymentPage.java Mon Sep 13 14:40:05 2010
@@ -19,11 +19,9 @@ package org.apache.geronimo.st.v30.ui.pa
import org.apache.geronimo.jee.application.Application;
import org.apache.geronimo.jee.applicationclient.ApplicationClient;
import org.apache.geronimo.jee.connector.Connector;
-import org.apache.geronimo.st.v30.ui.CommonMessages;
-import org.apache.geronimo.st.ui.editors.AbstractGeronimoDeploymentPlanEditor;
-import org.apache.geronimo.st.v30.ui.pages.AbstractGeronimoFormPage;
-import org.apache.geronimo.st.v30.core.GeronimoServerInfo;
+import org.apache.geronimo.st.ui.editors.AbstractGeronimoJAXBBasedEditor;
import org.apache.geronimo.st.v30.core.jaxb.JAXBModelUtils;
+import org.apache.geronimo.st.v30.ui.CommonMessages;
import org.apache.geronimo.st.v30.ui.sections.AdminObjectSection;
import org.apache.geronimo.st.v30.ui.sections.ClassFilterSection;
import org.apache.geronimo.st.v30.ui.sections.DependencySection;
@@ -37,7 +35,7 @@ import org.eclipse.ui.forms.editor.FormE
/*
* @version $Rev$ $Date$
*/
-public class DeploymentPage extends AbstractGeronimoFormPage {
+public class DeploymentPage extends AbstractDeploymentPlanFormPage {
public DeploymentPage(FormEditor editor, String id, String title) {
super(editor, id, title);
@@ -49,24 +47,24 @@ public class DeploymentPage extends Abst
* @see org.apache.geronimo.ui.pages.AbstractGeronimoFormPage#fillBody(org.eclipse.ui.forms.IManagedForm)
*/
protected void fillBody(IManagedForm managedForm) {
- managedForm.addPart(new DependencySection(getDeploymentPlan(), JAXBModelUtils.getEnvironment(getDeploymentPlan()), body, toolkit, getStyle()));
- managedForm.addPart(new GBeanSection(getDeploymentPlan(), JAXBModelUtils.getGbeans(getDeploymentPlan()), body, toolkit, getStyle()));
- managedForm.addPart(new ClassFilterSection(getDeploymentPlan(), JAXBModelUtils.getEnvironment(getDeploymentPlan()), body, toolkit, getStyle(), true, true));
- managedForm.addPart(new ClassFilterSection(getDeploymentPlan(), JAXBModelUtils.getEnvironment(getDeploymentPlan()), body, toolkit, getStyle(), true, false));
-
- if (Application.class.isInstance(getDeploymentPlan().getValue())) {
- Application application = (Application)((AbstractGeronimoDeploymentPlanEditor) getEditor()).getDeploymentPlan().getValue();
- managedForm.addPart(new ModuleSection(getDeploymentPlan(), body, toolkit, getStyle(), application.getModule()));
- managedForm.addPart(new ExtModuleSection(getDeploymentPlan(), body, toolkit, getStyle(), application.getExtModule()));
+ managedForm.addPart(new DependencySection(getRootElement(), JAXBModelUtils.getEnvironment(getRootElement()), body, toolkit, getStyle()));
+ managedForm.addPart(new GBeanSection(getRootElement(), JAXBModelUtils.getGbeans(getRootElement()), body, toolkit, getStyle()));
+ managedForm.addPart(new ClassFilterSection(getRootElement(), JAXBModelUtils.getEnvironment(getRootElement()), body, toolkit, getStyle(), true, true));
+ managedForm.addPart(new ClassFilterSection(getRootElement(), JAXBModelUtils.getEnvironment(getRootElement()), body, toolkit, getStyle(), true, false));
+
+ if (Application.class.isInstance(getRootElement().getValue())) {
+ Application application = (Application)((AbstractGeronimoJAXBBasedEditor) getEditor()).getRootElement().getValue();
+ managedForm.addPart(new ModuleSection(getRootElement(), body, toolkit, getStyle(), application.getModule()));
+ managedForm.addPart(new ExtModuleSection(getRootElement(), body, toolkit, getStyle(), application.getExtModule()));
}
- if (Connector.class.isInstance(getDeploymentPlan().getValue())) {
- Connector connector = (Connector)((AbstractGeronimoDeploymentPlanEditor) getEditor()).getDeploymentPlan().getValue();
- managedForm.addPart(new AdminObjectSection(getDeploymentPlan(), body, toolkit, getStyle(), connector.getAdminobject()));
+ if (Connector.class.isInstance(getRootElement().getValue())) {
+ Connector connector = (Connector)((AbstractGeronimoJAXBBasedEditor) getEditor()).getRootElement().getValue();
+ managedForm.addPart(new AdminObjectSection(getRootElement(), body, toolkit, getStyle(), connector.getAdminobject()));
}
- if (ApplicationClient.class.isInstance(getDeploymentPlan().getValue())) {
- managedForm.addPart(new DependencySection(getDeploymentPlan(), JAXBModelUtils.getEnvironment(getDeploymentPlan(), false), body, toolkit, getStyle(), false));
- managedForm.addPart(new ClassFilterSection(getDeploymentPlan(), JAXBModelUtils.getEnvironment(getDeploymentPlan(), false), body, toolkit, getStyle(), false, true));
- managedForm.addPart(new ClassFilterSection(getDeploymentPlan(), JAXBModelUtils.getEnvironment(getDeploymentPlan(), false), body, toolkit, getStyle(), false, false));
+ if (ApplicationClient.class.isInstance(getRootElement().getValue())) {
+ managedForm.addPart(new DependencySection(getRootElement(), JAXBModelUtils.getEnvironment(getRootElement(), false), body, toolkit, getStyle(), false));
+ managedForm.addPart(new ClassFilterSection(getRootElement(), JAXBModelUtils.getEnvironment(getRootElement(), false), body, toolkit, getStyle(), false, true));
+ managedForm.addPart(new ClassFilterSection(getRootElement(), JAXBModelUtils.getEnvironment(getRootElement(), false), body, toolkit, getStyle(), false, false));
}
}
@@ -86,9 +84,5 @@ public class DeploymentPage extends Abst
return CommonMessages.deploymentPageTitle;
}
- @Override
- protected void triggerGeronimoServerInfoUpdate() {
- GeronimoServerInfo.getInstance().updateInfo();
- }
}
Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.ui/src/main/java/org/apache/geronimo/st/v30/ui/pages/DeploymentPlanSourcePage.java
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.ui/src/main/java/org/apache/geronimo/st/v30/ui/pages/DeploymentPlanSourcePage.java?rev=996559&r1=996558&r2=996559&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.ui/src/main/java/org/apache/geronimo/st/v30/ui/pages/DeploymentPlanSourcePage.java (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.ui/src/main/java/org/apache/geronimo/st/v30/ui/pages/DeploymentPlanSourcePage.java Mon Sep 13 14:40:05 2010
@@ -16,7 +16,7 @@
*/
package org.apache.geronimo.st.v30.ui.pages;
-import org.apache.geronimo.st.ui.editors.AbstractGeronimoDeploymentPlanEditor;
+import org.apache.geronimo.st.ui.editors.AbstractGeronimoJAXBBasedEditor;
import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.jface.dialogs.MessageDialog;
import org.eclipse.swt.widgets.Display;
@@ -27,9 +27,9 @@ import org.eclipse.wst.sse.ui.Structured
*/
public class DeploymentPlanSourcePage extends StructuredTextEditor {
- protected AbstractGeronimoDeploymentPlanEditor editor;
+ protected AbstractGeronimoJAXBBasedEditor editor;
- public DeploymentPlanSourcePage (AbstractGeronimoDeploymentPlanEditor editor) {
+ public DeploymentPlanSourcePage (AbstractGeronimoJAXBBasedEditor editor) {
super();
this.editor = editor;
}
@@ -38,7 +38,7 @@ public class DeploymentPlanSourcePage ex
public void doSave(IProgressMonitor progressMonitor) {
super.doSave(progressMonitor);
try {
- editor.reloadDeploymentPlan();
+ editor.reloadFile();
} catch (Exception e) {
MessageDialog.openError(Display.getCurrent().getActiveShell(),"Error", e.getMessage());
}
Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.ui/src/main/java/org/apache/geronimo/st/v30/ui/pages/EjbOverviewPage.java
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.ui/src/main/java/org/apache/geronimo/st/v30/ui/pages/EjbOverviewPage.java?rev=996559&r1=996558&r2=996559&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.ui/src/main/java/org/apache/geronimo/st/v30/ui/pages/EjbOverviewPage.java (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.ui/src/main/java/org/apache/geronimo/st/v30/ui/pages/EjbOverviewPage.java Mon Sep 13 14:40:05 2010
@@ -26,7 +26,7 @@ import org.eclipse.ui.forms.editor.FormE
/**
* @version $Rev$ $Date$
*/
-public class EjbOverviewPage extends AbstractGeronimoFormPage {
+public class EjbOverviewPage extends AbstractDeploymentPlanFormPage {
public EjbOverviewPage(FormEditor editor, String id, String title) {
super(editor, id, title);
@@ -38,12 +38,8 @@ public class EjbOverviewPage extends Abs
* @see org.apache.geronimo.st.v30.ui.pages.AbstractGeronimoFormPage#fillBody(org.eclipse.ui.forms.IManagedForm)
*/
protected void fillBody(IManagedForm managedForm) {
- managedForm.addPart(new OpenEjbJarGeneralSection(body, toolkit, getStyle(), getDeploymentPlan()));
- managedForm.addPart(new OpenEjbJarCMPSection(body, toolkit, getStyle(), getDeploymentPlan()));
+ managedForm.addPart(new OpenEjbJarGeneralSection(body, toolkit, getStyle(), getRootElement()));
+ managedForm.addPart(new OpenEjbJarCMPSection(body, toolkit, getStyle(), getRootElement()));
}
- @Override
- protected void triggerGeronimoServerInfoUpdate() {
- GeronimoServerInfo.getInstance().updateInfo();
- }
}
Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.ui/src/main/java/org/apache/geronimo/st/v30/ui/pages/NamingFormPage.java
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.ui/src/main/java/org/apache/geronimo/st/v30/ui/pages/NamingFormPage.java?rev=996559&r1=996558&r2=996559&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.ui/src/main/java/org/apache/geronimo/st/v30/ui/pages/NamingFormPage.java (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.ui/src/main/java/org/apache/geronimo/st/v30/ui/pages/NamingFormPage.java Mon Sep 13 14:40:05 2010
@@ -19,10 +19,8 @@ package org.apache.geronimo.st.v30.ui.pa
import org.apache.geronimo.jee.applicationclient.ApplicationClient;
import org.apache.geronimo.jee.openejb.OpenejbJar;
import org.apache.geronimo.jee.web.WebApp;
-import org.apache.geronimo.st.v30.core.GeronimoServerInfo;
+import org.apache.geronimo.st.ui.editors.AbstractGeronimoJAXBBasedEditor;
import org.apache.geronimo.st.v30.ui.CommonMessages;
-import org.apache.geronimo.st.ui.editors.AbstractGeronimoDeploymentPlanEditor;
-import org.apache.geronimo.st.v30.ui.pages.AbstractGeronimoFormPage;
import org.apache.geronimo.st.v30.ui.sections.EjbLocalRefSection;
import org.apache.geronimo.st.v30.ui.sections.EjbRefSection;
import org.apache.geronimo.st.v30.ui.sections.EjbRelationSection;
@@ -40,7 +38,7 @@ import org.eclipse.ui.forms.editor.FormE
/**
* @version $Rev$ $Date$
*/
-public class NamingFormPage extends AbstractGeronimoFormPage {
+public class NamingFormPage extends AbstractDeploymentPlanFormPage {
public NamingFormPage(FormEditor editor, String id, String title) {
super(editor, id, title);
@@ -52,31 +50,31 @@ public class NamingFormPage extends Abst
* @see org.apache.geronimo.ui.pages.AbstractGeronimoFormPage#fillBody(org.eclipse.ui.forms.IManagedForm)
*/
protected void fillBody(IManagedForm managedForm) {
- if (WebApp.class.isInstance (getDeploymentPlan().getValue())) {
- WebApp webapp = (WebApp)((AbstractGeronimoDeploymentPlanEditor) getEditor()).getDeploymentPlan().getValue();
- managedForm.addPart(new EjbRefSection(getDeploymentPlan(), body, toolkit, getStyle(), webapp.getEjbRef()));
- managedForm.addPart(new ResourceRefSection(getDeploymentPlan(), body, toolkit, getStyle(), webapp.getResourceRef()));
- managedForm.addPart(new ServiceRefSection(getDeploymentPlan(), body, toolkit, getStyle(), webapp.getServiceRef()));
- managedForm.addPart(new ResourceEnvRefSection(getDeploymentPlan(), body, toolkit, getStyle(), webapp.getResourceEnvRef()));
- managedForm.addPart(new EjbLocalRefSection(getDeploymentPlan(), body, toolkit, getStyle(), webapp.getEjbLocalRef()));
- managedForm.addPart(new GBeanRefSection(getDeploymentPlan(), body, toolkit, getStyle(), webapp.getAbstractNamingEntry()));
- managedForm.addPart(new PersContextRefSection(getDeploymentPlan(), body, toolkit, getStyle(), webapp.getAbstractNamingEntry()));
- managedForm.addPart(new PersUnitRefSection(getDeploymentPlan(), body, toolkit, getStyle(), webapp.getAbstractNamingEntry()));
- managedForm.addPart(new MessageDestSection(getDeploymentPlan(), body, toolkit, getStyle(), webapp.getMessageDestination()));
+ if (WebApp.class.isInstance (getRootElement().getValue())) {
+ WebApp webapp = (WebApp)((AbstractGeronimoJAXBBasedEditor) getEditor()).getRootElement().getValue();
+ managedForm.addPart(new EjbRefSection(getRootElement(), body, toolkit, getStyle(), webapp.getEjbRef()));
+ managedForm.addPart(new ResourceRefSection(getRootElement(), body, toolkit, getStyle(), webapp.getResourceRef()));
+ managedForm.addPart(new ServiceRefSection(getRootElement(), body, toolkit, getStyle(), webapp.getServiceRef()));
+ managedForm.addPart(new ResourceEnvRefSection(getRootElement(), body, toolkit, getStyle(), webapp.getResourceEnvRef()));
+ managedForm.addPart(new EjbLocalRefSection(getRootElement(), body, toolkit, getStyle(), webapp.getEjbLocalRef()));
+ managedForm.addPart(new GBeanRefSection(getRootElement(), body, toolkit, getStyle(), webapp.getAbstractNamingEntry()));
+ managedForm.addPart(new PersContextRefSection(getRootElement(), body, toolkit, getStyle(), webapp.getAbstractNamingEntry()));
+ managedForm.addPart(new PersUnitRefSection(getRootElement(), body, toolkit, getStyle(), webapp.getAbstractNamingEntry()));
+ managedForm.addPart(new MessageDestSection(getRootElement(), body, toolkit, getStyle(), webapp.getMessageDestination()));
}
- else if (ApplicationClient.class.isInstance (getDeploymentPlan().getValue())){
- ApplicationClient appClient = (ApplicationClient)((AbstractGeronimoDeploymentPlanEditor) getEditor()).getDeploymentPlan().getValue();
- managedForm.addPart(new EjbRefSection(getDeploymentPlan(), body, toolkit, getStyle(), appClient.getEjbRef()));
- managedForm.addPart(new ResourceRefSection(getDeploymentPlan(), body, toolkit, getStyle(), appClient.getResourceRef()));
- managedForm.addPart(new ServiceRefSection(getDeploymentPlan(), body, toolkit, getStyle(), appClient.getServiceRef()));
- managedForm.addPart(new ResourceEnvRefSection(getDeploymentPlan(), body, toolkit, getStyle(), appClient.getResourceEnvRef()));
- managedForm.addPart(new GBeanRefSection(getDeploymentPlan(), body, toolkit, getStyle(), appClient.getGbeanRef()));
- managedForm.addPart(new MessageDestSection(getDeploymentPlan(), body, toolkit, getStyle(), appClient.getMessageDestination()));
+ else if (ApplicationClient.class.isInstance (getRootElement().getValue())){
+ ApplicationClient appClient = (ApplicationClient)((AbstractGeronimoJAXBBasedEditor) getEditor()).getRootElement().getValue();
+ managedForm.addPart(new EjbRefSection(getRootElement(), body, toolkit, getStyle(), appClient.getEjbRef()));
+ managedForm.addPart(new ResourceRefSection(getRootElement(), body, toolkit, getStyle(), appClient.getResourceRef()));
+ managedForm.addPart(new ServiceRefSection(getRootElement(), body, toolkit, getStyle(), appClient.getServiceRef()));
+ managedForm.addPart(new ResourceEnvRefSection(getRootElement(), body, toolkit, getStyle(), appClient.getResourceEnvRef()));
+ managedForm.addPart(new GBeanRefSection(getRootElement(), body, toolkit, getStyle(), appClient.getGbeanRef()));
+ managedForm.addPart(new MessageDestSection(getRootElement(), body, toolkit, getStyle(), appClient.getMessageDestination()));
}
- else if (OpenejbJar.class.isInstance (getDeploymentPlan().getValue())){
- OpenejbJar ejbJar = (OpenejbJar)((AbstractGeronimoDeploymentPlanEditor) getEditor()).getDeploymentPlan().getValue();
- managedForm.addPart(new EjbRelationSection(getDeploymentPlan(), body, toolkit, getStyle(), ejbJar.getRelationships()));
- managedForm.addPart(new MessageDestSection(getDeploymentPlan(), body, toolkit, getStyle(), ejbJar.getMessageDestination()));
+ else if (OpenejbJar.class.isInstance (getRootElement().getValue())){
+ OpenejbJar ejbJar = (OpenejbJar)((AbstractGeronimoJAXBBasedEditor) getEditor()).getRootElement().getValue();
+ managedForm.addPart(new EjbRelationSection(getRootElement(), body, toolkit, getStyle(), ejbJar.getRelationships()));
+ managedForm.addPart(new MessageDestSection(getRootElement(), body, toolkit, getStyle(), ejbJar.getMessageDestination()));
}
}
@@ -96,8 +94,4 @@ public class NamingFormPage extends Abst
return CommonMessages.namingFormPageTitle;
}
- @Override
- protected void triggerGeronimoServerInfoUpdate() {
- GeronimoServerInfo.getInstance().updateInfo();
- }
}
Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.ui/src/main/java/org/apache/geronimo/st/v30/ui/pages/SecurityPage.java
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.ui/src/main/java/org/apache/geronimo/st/v30/ui/pages/SecurityPage.java?rev=996559&r1=996558&r2=996559&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.ui/src/main/java/org/apache/geronimo/st/v30/ui/pages/SecurityPage.java (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.ui/src/main/java/org/apache/geronimo/st/v30/ui/pages/SecurityPage.java Mon Sep 13 14:40:05 2010
@@ -30,7 +30,7 @@ import org.eclipse.ui.forms.editor.FormE
/**
* @version $Rev$ $Date$
*/
-public class SecurityPage extends AbstractGeronimoFormPage {
+public class SecurityPage extends AbstractDeploymentPlanFormPage {
public SecurityPage(FormEditor editor, String id, String title) {
super(editor, id, title);
@@ -42,9 +42,9 @@ public class SecurityPage extends Abstra
* @see org.apache.geronimo.ui.pages.AbstractGeronimoFormPage#fillBody(org.eclipse.ui.forms.IManagedForm)
*/
protected void fillBody(IManagedForm managedForm) {
- managedForm.addPart(new SecurityRealmSection(getDeploymentPlan(),JAXBModelUtils.getGbeans(getDeploymentPlan()), body, toolkit, getStyle()));
- managedForm.addPart(new SecurityRoleMappingSection(getDeploymentPlan(), getDeploymentDescriptor(), body, toolkit, getStyle()));
- managedForm.addPart(new SecurityAdvancedSection(getDeploymentPlan(), body, toolkit, getStyle()));
+ managedForm.addPart(new SecurityRealmSection(getRootElement(),JAXBModelUtils.getGbeans(getRootElement()), body, toolkit, getStyle()));
+ managedForm.addPart(new SecurityRoleMappingSection(getRootElement(), getDeploymentDescriptor(), body, toolkit, getStyle()));
+ managedForm.addPart(new SecurityAdvancedSection(getRootElement(), body, toolkit, getStyle()));
}
/*
@@ -67,9 +67,5 @@ public class SecurityPage extends Abstra
return CommonMessages.securityPageTitle;
}
- @Override
- protected void triggerGeronimoServerInfoUpdate() {
- GeronimoServerInfo.getInstance().updateInfo();
- }
}
Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.ui/src/main/java/org/apache/geronimo/st/v30/ui/pages/WebGeneralPage.java
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.ui/src/main/java/org/apache/geronimo/st/v30/ui/pages/WebGeneralPage.java?rev=996559&r1=996558&r2=996559&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.ui/src/main/java/org/apache/geronimo/st/v30/ui/pages/WebGeneralPage.java (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.ui/src/main/java/org/apache/geronimo/st/v30/ui/pages/WebGeneralPage.java Mon Sep 13 14:40:05 2010
@@ -16,9 +16,7 @@
*/
package org.apache.geronimo.st.v30.ui.pages;
-import org.apache.geronimo.st.v30.core.GeronimoServerInfo;
import org.apache.geronimo.st.v30.ui.CommonMessages;
-import org.apache.geronimo.st.v30.ui.pages.AbstractGeronimoFormPage;
import org.apache.geronimo.st.v30.ui.sections.WebContainerSection;
import org.apache.geronimo.st.v30.ui.sections.WebGeneralSection;
import org.eclipse.ui.forms.IManagedForm;
@@ -27,7 +25,7 @@ import org.eclipse.ui.forms.editor.FormE
/**
* @version $Rev$ $Date$
*/
-public class WebGeneralPage extends AbstractGeronimoFormPage {
+public class WebGeneralPage extends AbstractDeploymentPlanFormPage {
public WebGeneralPage(FormEditor editor, String id, String title) {
super(editor, id, title);
@@ -39,8 +37,8 @@ public class WebGeneralPage extends Abst
* @see org.apache.geronimo.ui.pages.AbstractGeronimoFormPage#fillBody(org.eclipse.ui.forms.IManagedForm)
*/
protected void fillBody(IManagedForm managedForm) {
- managedForm.addPart(new WebGeneralSection(body, toolkit, getStyle(), getDeploymentPlan()));
- managedForm.addPart(new WebContainerSection(body, toolkit, getStyle(), getDeploymentPlan()));
+ managedForm.addPart(new WebGeneralSection(body, toolkit, getStyle(), getRootElement()));
+ managedForm.addPart(new WebContainerSection(body, toolkit, getStyle(), getRootElement()));
}
/*
@@ -52,8 +50,4 @@ public class WebGeneralPage extends Abst
return CommonMessages.webGeneralPageTitle;
}
- @Override
- protected void triggerGeronimoServerInfoUpdate() {
- GeronimoServerInfo.getInstance().updateInfo();
- }
}
Added: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.ui/src/main/java/org/apache/geronimo/st/v30/ui/pages/blueprint/AbstractBlueprintFormPage.java
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.ui/src/main/java/org/apache/geronimo/st/v30/ui/pages/blueprint/AbstractBlueprintFormPage.java?rev=996559&view=auto
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.ui/src/main/java/org/apache/geronimo/st/v30/ui/pages/blueprint/AbstractBlueprintFormPage.java (added)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.ui/src/main/java/org/apache/geronimo/st/v30/ui/pages/blueprint/AbstractBlueprintFormPage.java Mon Sep 13 14:40:05 2010
@@ -0,0 +1,32 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.geronimo.st.v30.ui.pages.blueprint;
+
+import org.apache.geronimo.st.v30.ui.pages.AbstractGeronimoFormPage;
+import org.eclipse.ui.forms.editor.FormEditor;
+
+/**
+ * @version $Rev: 939152 $ $Date: 2010-04-29 08:57:12 +0800 (Thu, 29 Apr 2010) $
+ */
+public abstract class AbstractBlueprintFormPage extends AbstractGeronimoFormPage {
+
+ public AbstractBlueprintFormPage(FormEditor editor, String id, String title) {
+ super(editor, id, title);
+ }
+
+
+}
Added: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.ui/src/main/java/org/apache/geronimo/st/v30/ui/pages/blueprint/BeanPage.java
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.ui/src/main/java/org/apache/geronimo/st/v30/ui/pages/blueprint/BeanPage.java?rev=996559&view=auto
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.ui/src/main/java/org/apache/geronimo/st/v30/ui/pages/blueprint/BeanPage.java (added)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.ui/src/main/java/org/apache/geronimo/st/v30/ui/pages/blueprint/BeanPage.java Mon Sep 13 14:40:05 2010
@@ -0,0 +1,58 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.geronimo.st.v30.ui.pages.blueprint;
+
+import javax.xml.bind.JAXBElement;
+
+import org.apache.geronimo.osgi.blueprint.Tblueprint;
+import org.apache.geronimo.st.v30.ui.CommonMessages;
+import org.apache.geronimo.st.v30.ui.sections.blueprint.BlueprintDescriptionSection;
+import org.apache.geronimo.st.v30.ui.sections.blueprint.BlueprintGeneralSection;
+import org.apache.geronimo.st.v30.ui.sections.blueprint.TypeConverterSection;
+import org.eclipse.ui.forms.IManagedForm;
+import org.eclipse.ui.forms.editor.FormEditor;
+
+/**
+ * @version $Rev: 939152 $ $Date: 2010-04-29 08:57:12 +0800 (Thu, 29 Apr 2010) $
+ */
+public class BeanPage extends AbstractBlueprintFormPage {
+
+ public BeanPage(FormEditor editor, String id, String title) {
+ super(editor, id, title);
+ }
+
+ @Override
+ protected void triggerGeronimoServerInfoUpdate() {
+ //do nothing
+ }
+
+ @Override
+ protected void fillBody(IManagedForm managedForm) {
+ JAXBElement blueprint = getRootElement();
+ if (blueprint!=null && Tblueprint.class.isInstance(blueprint.getValue()))
+ managedForm.addPart(new BlueprintGeneralSection(body, toolkit, getStyle(), blueprint));
+ managedForm.addPart(new BlueprintDescriptionSection(body, toolkit, getStyle(), blueprint));
+ managedForm.addPart(new TypeConverterSection(body, toolkit, getStyle(),blueprint));
+
+ }
+
+ public String getFormTitle() {
+ return CommonMessages.blueprintGeneralPageTitle;
+ }
+
+
+}
Added: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.ui/src/main/java/org/apache/geronimo/st/v30/ui/pages/blueprint/BlueprintPage.java
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.ui/src/main/java/org/apache/geronimo/st/v30/ui/pages/blueprint/BlueprintPage.java?rev=996559&view=auto
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.ui/src/main/java/org/apache/geronimo/st/v30/ui/pages/blueprint/BlueprintPage.java (added)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v30.ui/src/main/java/org/apache/geronimo/st/v30/ui/pages/blueprint/BlueprintPage.java Mon Sep 13 14:40:05 2010
@@ -0,0 +1,60 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.geronimo.st.v30.ui.pages.blueprint;
+
+import javax.xml.bind.JAXBElement;
+
+import org.apache.geronimo.osgi.blueprint.Tblueprint;
+import org.apache.geronimo.st.v30.ui.CommonMessages;
+import org.apache.geronimo.st.v30.ui.sections.blueprint.BlueprintDescriptionSection;
+import org.apache.geronimo.st.v30.ui.sections.blueprint.BlueprintGeneralSection;
+import org.apache.geronimo.st.v30.ui.sections.blueprint.OtherElementsSection;
+import org.apache.geronimo.st.v30.ui.sections.blueprint.TypeConverterSection;
+import org.eclipse.ui.forms.IManagedForm;
+import org.eclipse.ui.forms.editor.FormEditor;
+
+/**
+ * @version $Rev: 939152 $ $Date: 2010-04-29 08:57:12 +0800 (Thu, 29 Apr 2010) $
+ */
+public class BlueprintPage extends AbstractBlueprintFormPage {
+
+ public BlueprintPage(FormEditor editor, String id, String title) {
+ super(editor, id, title);
+ }
+
+ @Override
+ protected void triggerGeronimoServerInfoUpdate() {
+ //do nothing
+ }
+
+ @Override
+ protected void fillBody(IManagedForm managedForm) {
+ JAXBElement blueprint = getRootElement();
+ if (blueprint!=null && Tblueprint.class.isInstance(blueprint.getValue()))
+ managedForm.addPart(new BlueprintGeneralSection(body, toolkit, getStyle(), blueprint));
+ managedForm.addPart(new BlueprintDescriptionSection(body, toolkit, getStyle(), blueprint));
+ managedForm.addPart(new TypeConverterSection(body, toolkit, getStyle(),blueprint));
+ managedForm.addPart(new OtherElementsSection(body, toolkit, getStyle(),blueprint));
+
+ }
+
+ public String getFormTitle() {
+ return CommonMessages.blueprintGeneralPageTitle;
+ }
+
+
+}