tomee-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From gdam...@apache.org
Subject svn commit: r713679 - in /openejb/trunk/openejb3: ./ container/openejb-jee/src/main/java/org/apache/openejb/jee/oejb2/ container/openejb-jee/src/test/resources/
Date Thu, 13 Nov 2008 08:34:41 GMT
Author: gdamour
Date: Thu Nov 13 00:34:40 2008
New Revision: 713679

URL: http://svn.apache.org/viewvc?rev=713679&view=rev
Log:
Revert addition of private-classes element. Private classes can be
configured via scripts.

(GERONIMO-4403) Provide a mechanism to hide specific classes  of a configuration to all its
children

Modified:
    openejb/trunk/openejb3/   (props changed)
    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

Propchange: openejb/trunk/openejb3/
------------------------------------------------------------------------------
    svn:mergeinfo = 

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=713679&r1=713678&r2=713679&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 Nov 13 00:34:40 2008
@@ -37,7 +37,6 @@
  *         <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>
@@ -54,7 +53,6 @@
     "dependencies",
     "hiddenClasses",
     "nonOverridableClasses",
-    "privateClasses",
     "inverseClassloading",
     "suppressDefaultEnvironment"
 })
@@ -68,8 +66,6 @@
     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")
@@ -172,30 +168,6 @@
     }
 
     /**
-     * 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=713679&r1=713678&r2=713679&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 Nov 13 00:34:40 2008
@@ -91,7 +91,6 @@
         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=713679&r1=713678&r2=713679&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 Nov 13 00:34:40 2008
@@ -51,10 +51,6 @@
             <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=713679&r1=713678&r2=713679&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 Nov 13 00:34:40 2008
@@ -51,10 +51,6 @@
             <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>



Mime
View raw message