Author: delos
Date: Tue Aug 4 09:38:49 2009
New Revision: 800717
URL: http://svn.apache.org/viewvc?rev=800717&view=rev
Log:
GERONIMODEVTOOLS-573 <sec:security/> was added to plan after add a resource-ref via
GEP UI. Thanks Rodger for this patch!
Modified:
geronimo/devtools/eclipse-plugin/branches/2.1.5/plugins/org.apache.geronimo.st.v21.core/src/main/java/org/apache/geronimo/st/v21/core/jaxb/JAXBModelUtils.java
Modified: geronimo/devtools/eclipse-plugin/branches/2.1.5/plugins/org.apache.geronimo.st.v21.core/src/main/java/org/apache/geronimo/st/v21/core/jaxb/JAXBModelUtils.java
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/branches/2.1.5/plugins/org.apache.geronimo.st.v21.core/src/main/java/org/apache/geronimo/st/v21/core/jaxb/JAXBModelUtils.java?rev=800717&r1=800716&r2=800717&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/branches/2.1.5/plugins/org.apache.geronimo.st.v21.core/src/main/java/org/apache/geronimo/st/v21/core/jaxb/JAXBModelUtils.java
(original)
+++ geronimo/devtools/eclipse-plugin/branches/2.1.5/plugins/org.apache.geronimo.st.v21.core/src/main/java/org/apache/geronimo/st/v21/core/jaxb/JAXBModelUtils.java
Tue Aug 4 09:38:49 2009
@@ -39,30 +39,21 @@
Object plan = element.getValue();
if (WebApp.class.isInstance (plan)) {
if (((WebApp)plan).getSecurity() == null) {
- setSecurity (element, new org.apache.geronimo.jee.security.ObjectFactory().createSecurity());
+ return null;
}
Security security = (Security)((WebApp)plan).getSecurity().getValue();
- if (security.getRoleMappings() == null) {
- security.setRoleMappings (new org.apache.geronimo.jee.security.ObjectFactory().createRoleMappings());
- }
return security;
} else if (Application.class.isInstance (plan)) {
if (((Application)plan).getSecurity() == null) {
- setSecurity (element, new org.apache.geronimo.jee.security.ObjectFactory().createSecurity());
+ return null;
}
Security security = (Security)((Application)plan).getSecurity().getValue();
- if (security.getRoleMappings() == null) {
- security.setRoleMappings (new org.apache.geronimo.jee.security.ObjectFactory().createRoleMappings());
- }
return security;
} else if (OpenejbJar.class.isInstance (plan)) {
if (((OpenejbJar)plan).getSecurity() == null) {
- setSecurity (element, new org.apache.geronimo.jee.security.ObjectFactory().createSecurity());
+ return null;
}
Security security = (Security)((OpenejbJar)plan).getSecurity().getValue();
- if (security.getRoleMappings() == null) {
- security.setRoleMappings (new org.apache.geronimo.jee.security.ObjectFactory().createRoleMappings());
- }
return security;
}
return null;
|