You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tomee.apache.org by dj...@apache.org on 2010/06/17 01:06:35 UTC
svn commit: r955424 - in
/openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee:
DescriptionType.java LoginConfigType.java WebApp.java WebCommon.java
WebFragment.java
Author: djencks
Date: Wed Jun 16 23:06:35 2010
New Revision: 955424
URL: http://svn.apache.org/viewvc?rev=955424&view=rev
Log:
OPENEJB-1298 minor cleanup
Removed:
openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/DescriptionType.java
openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/LoginConfigType.java
Modified:
openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/WebApp.java
openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/WebCommon.java
openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/WebFragment.java
Modified: openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/WebApp.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/WebApp.java?rev=955424&r1=955423&r2=955424&view=diff
==============================================================================
--- openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/WebApp.java (original)
+++ openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/WebApp.java Wed Jun 16 23:06:35 2010
@@ -110,7 +110,7 @@ public class WebApp implements WebCommon
@XmlElement(name = "security-constraint")
protected List<SecurityConstraint> securityConstraint;
@XmlElement(name = "login-config")
- protected List<LoginConfigType> loginConfig;
+ protected List<LoginConfig> loginConfig;
@XmlElement(name = "security-role")
protected List<SecurityRole> securityRole;
@XmlElement(name = "locale-encoding-mapping-list")
@@ -336,9 +336,9 @@ public class WebApp implements WebCommon
}
@Override
- public List<LoginConfigType> getLoginConfig() {
+ public List<LoginConfig> getLoginConfig() {
if (loginConfig == null) {
- loginConfig = new ArrayList<LoginConfigType>();
+ loginConfig = new ArrayList<LoginConfig>();
}
return this.loginConfig;
}
Modified: openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/WebCommon.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/WebCommon.java?rev=955424&r1=955423&r2=955424&view=diff
==============================================================================
--- openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/WebCommon.java (original)
+++ openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/WebCommon.java Wed Jun 16 23:06:35 2010
@@ -81,7 +81,7 @@ public interface WebCommon extends JndiC
List<SecurityConstraint> getSecurityConstraint();
- List<LoginConfigType> getLoginConfig();
+ List<LoginConfig> getLoginConfig();
List<SecurityRole> getSecurityRole();
Modified: openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/WebFragment.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/WebFragment.java?rev=955424&r1=955423&r2=955424&view=diff
==============================================================================
--- openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/WebFragment.java (original)
+++ openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/WebFragment.java Wed Jun 16 23:06:35 2010
@@ -110,7 +110,7 @@ public class WebFragment implements WebC
@XmlElement(name = "security-constraint")
protected List<SecurityConstraint> securityConstraint;
@XmlElement(name = "login-config")
- protected List<LoginConfigType> loginConfig;
+ protected List<LoginConfig> loginConfig;
@XmlElement(name = "security-role")
protected List<SecurityRole> securityRole;
@XmlElement(name = "locale-encoding-mapping-list")
@@ -336,9 +336,9 @@ public class WebFragment implements WebC
}
@Override
- public List<LoginConfigType> getLoginConfig() {
+ public List<LoginConfig> getLoginConfig() {
if (loginConfig == null) {
- loginConfig = new ArrayList<LoginConfigType>();
+ loginConfig = new ArrayList<LoginConfig>();
}
return this.loginConfig;
}