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 2008/12/04 21:40:25 UTC
svn commit: r723428 - in /openejb/trunk/openejb3/container/openejb-jee/src:
main/java/org/apache/openejb/jee/oejb2/ test/resources/
Author: djencks
Date: Thu Dec 4 12:40:25 2008
New Revision: 723428
URL: http://svn.apache.org/viewvc?rev=723428&view=rev
Log:
Reapply Gianny's private-classes patch for GERONIMO-4403. Reverts rev 713679, reapplies rev 712329
Modified:
openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/oejb2/EnvironmentType.java
openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/oejb2/NamespaceFilter.java
openejb/trunk/openejb3/container/openejb-jee/src/test/resources/geronimo-openejb-converted.xml
openejb/trunk/openejb3/container/openejb-jee/src/test/resources/openejb-jar-2-full.xml
Modified: openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/oejb2/EnvironmentType.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/oejb2/EnvironmentType.java?rev=723428&r1=723427&r2=723428&view=diff
==============================================================================
--- openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/oejb2/EnvironmentType.java (original)
+++ openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/oejb2/EnvironmentType.java Thu Dec 4 12:40:25 2008
@@ -37,6 +37,7 @@
* <element name="dependencies" type="{http://geronimo.apache.org/xml/ns/deployment-1.2}dependenciesType" minOccurs="0"/>
* <element name="hidden-classes" type="{http://geronimo.apache.org/xml/ns/deployment-1.2}classFilterType" minOccurs="0"/>
* <element name="non-overridable-classes" type="{http://geronimo.apache.org/xml/ns/deployment-1.2}classFilterType" minOccurs="0"/>
+ * <element name="private-classes" type="{http://geronimo.apache.org/xml/ns/deployment-1.2}classFilterType" minOccurs="0"/>
* <element name="inverse-classloading" type="{http://geronimo.apache.org/xml/ns/deployment-1.2}emptyType" minOccurs="0"/>
* <element name="suppress-default-environment" type="{http://geronimo.apache.org/xml/ns/deployment-1.2}emptyType" minOccurs="0"/>
* </sequence>
@@ -53,6 +54,7 @@
"dependencies",
"hiddenClasses",
"nonOverridableClasses",
+ "privateClasses",
"inverseClassloading",
"suppressDefaultEnvironment"
})
@@ -66,6 +68,8 @@
protected ClassFilterType hiddenClasses;
@XmlElement(name = "non-overridable-classes", namespace = "http://geronimo.apache.org/xml/ns/deployment-1.2")
protected ClassFilterType nonOverridableClasses;
+ @XmlElement(name = "private-classes", namespace = "http://geronimo.apache.org/xml/ns/deployment-1.2")
+ protected ClassFilterType privateClasses;
@XmlElement(name = "inverse-classloading", namespace = "http://geronimo.apache.org/xml/ns/deployment-1.2")
protected EmptyType inverseClassloading;
@XmlElement(name = "suppress-default-environment", namespace = "http://geronimo.apache.org/xml/ns/deployment-1.2")
@@ -168,6 +172,30 @@
}
/**
+ * Gets the value of the privateClasses property.
+ *
+ * @return
+ * possible object is
+ * {@link ClassFilterType }
+ *
+ */
+ public ClassFilterType getPrivateClasses() {
+ return privateClasses;
+ }
+
+ /**
+ * Sets the value of the privateClasses property.
+ *
+ * @param value
+ * allowed object is
+ * {@link ClassFilterType }
+ *
+ */
+ public void setPrivatelasses(ClassFilterType value) {
+ this.privateClasses = value;
+ }
+
+ /**
* Gets the value of the inverseClassloading property.
*
* @return
Modified: openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/oejb2/NamespaceFilter.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/oejb2/NamespaceFilter.java?rev=723428&r1=723427&r2=723428&view=diff
==============================================================================
--- openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/oejb2/NamespaceFilter.java (original)
+++ openejb/trunk/openejb3/container/openejb-jee/src/main/java/org/apache/openejb/jee/oejb2/NamespaceFilter.java Thu Dec 4 12:40:25 2008
@@ -91,6 +91,7 @@
ns.put("port-completion", "http://geronimo.apache.org/xml/ns/naming-1.2");
ns.put("port-name", "http://geronimo.apache.org/xml/ns/naming-1.2");
ns.put("primary-key-class", "http://openejb.apache.org/xml/ns/pkgen-2.1");
+ ns.put("private-classes", "http://geronimo.apache.org/xml/ns/deployment-1.2");
ns.put("property", "http://geronimo.apache.org/xml/ns/naming-1.2");
ns.put("protocol", "http://geronimo.apache.org/xml/ns/naming-1.2");
ns.put("ref-name", "http://geronimo.apache.org/xml/ns/naming-1.2");
Modified: openejb/trunk/openejb3/container/openejb-jee/src/test/resources/geronimo-openejb-converted.xml
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-jee/src/test/resources/geronimo-openejb-converted.xml?rev=723428&r1=723427&r2=723428&view=diff
==============================================================================
--- openejb/trunk/openejb3/container/openejb-jee/src/test/resources/geronimo-openejb-converted.xml (original)
+++ openejb/trunk/openejb3/container/openejb-jee/src/test/resources/geronimo-openejb-converted.xml Thu Dec 4 12:40:25 2008
@@ -51,6 +51,10 @@
<filter>String</filter>
<filter>String</filter>
</non-overridable-classes>
+ <private-classes>
+ <filter>String</filter>
+ <filter>String</filter>
+ </private-classes>
<inverse-classloading/>
<suppress-default-environment/>
</environment>
Modified: openejb/trunk/openejb3/container/openejb-jee/src/test/resources/openejb-jar-2-full.xml
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-jee/src/test/resources/openejb-jar-2-full.xml?rev=723428&r1=723427&r2=723428&view=diff
==============================================================================
--- openejb/trunk/openejb3/container/openejb-jee/src/test/resources/openejb-jar-2-full.xml (original)
+++ openejb/trunk/openejb3/container/openejb-jee/src/test/resources/openejb-jar-2-full.xml Thu Dec 4 12:40:25 2008
@@ -51,6 +51,10 @@
<filter>String</filter>
<filter>String</filter>
</non-overridable-classes>
+ <private-classes>
+ <filter>String</filter>
+ <filter>String</filter>
+ </private-classes>
<inverse-classloading/>
<suppress-default-environment/>
</environment>