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 2006/09/30 19:30:08 UTC
svn commit: r451626 - in /incubator/openejb/trunk/openejb2/modules:
openejb-builder/ openejb-builder/src/schema/
openejb-builder/src/test/java/org/apache/openejb/corba/security/config/tss/
openejb-builder/src/test/java/org/apache/openejb/deployment/ op...
Author: djencks
Date: Sat Sep 30 10:30:07 2006
New Revision: 451626
URL: http://svn.apache.org/viewvc?view=rev&rev=451626
Log:
OPENEJB-274 change xsd namespaces to openejb.apache.org....
Added:
incubator/openejb/trunk/openejb2/modules/openejb-builder/src/schema/corba-css-config-2.1.xsd (contents, props changed)
- copied, changed from r450979, incubator/openejb/trunk/openejb2/modules/openejb-builder/src/schema/corba-css-config-2.0.xsd
incubator/openejb/trunk/openejb2/modules/openejb-pkgen-builder/src/schema/openejb-pkgen-2.1.xsd (contents, props changed)
- copied, changed from r450979, incubator/openejb/trunk/openejb2/modules/openejb-pkgen-builder/src/schema/openejb-pkgen-2.0.xsd
Removed:
incubator/openejb/trunk/openejb2/modules/openejb-builder/src/schema/corba-css-config-2.0.xsd
incubator/openejb/trunk/openejb2/modules/openejb-pkgen-builder/src/schema/openejb-pkgen-2.0.xsd
Modified:
incubator/openejb/trunk/openejb2/modules/openejb-builder/pom.xml
incubator/openejb/trunk/openejb2/modules/openejb-builder/src/schema/corba-tss-config-2.1.xsd
incubator/openejb/trunk/openejb2/modules/openejb-builder/src/schema/openejb-jar-2.2.xsd
incubator/openejb/trunk/openejb2/modules/openejb-builder/src/schema/resolver-catalog.xml
incubator/openejb/trunk/openejb2/modules/openejb-builder/src/schema/xmlconfig.xml
incubator/openejb/trunk/openejb2/modules/openejb-builder/src/test/java/org/apache/openejb/corba/security/config/tss/TSSConfigEditorTest.java
incubator/openejb/trunk/openejb2/modules/openejb-builder/src/test/java/org/apache/openejb/deployment/DeploymentTestSuite.java
incubator/openejb/trunk/openejb2/modules/openejb-builder/src/test/java/org/apache/openejb/deployment/EarDeploymentTest.java
incubator/openejb/trunk/openejb2/modules/openejb-builder/src/test/java/org/apache/openejb/deployment/EjbJarModuleDeploymentTest.java
incubator/openejb/trunk/openejb2/modules/openejb-builder/src/test/java/org/apache/openejb/deployment/UnpackedModuleDeploymentTest.java
incubator/openejb/trunk/openejb2/modules/openejb-pkgen-builder/pom.xml
incubator/openejb/trunk/openejb2/modules/openejb-pkgen-builder/src/schema/xmlconfig.xml
Modified: incubator/openejb/trunk/openejb2/modules/openejb-builder/pom.xml
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb2/modules/openejb-builder/pom.xml?view=diff&rev=451626&r1=451625&r2=451626
==============================================================================
--- incubator/openejb/trunk/openejb2/modules/openejb-builder/pom.xml (original)
+++ incubator/openejb/trunk/openejb2/modules/openejb-builder/pom.xml Sat Sep 30 10:30:07 2006
@@ -162,7 +162,7 @@
<configuration>
<schemaDirectory>${basedir}/src/schema</schemaDirectory>
<sourceSchemas>
- corba-css-config-2.0.xsd,corba-tss-config-2.1.xsd,openejb-jar-2.2.xsd</sourceSchemas>
+ corba-css-config-2.1.xsd,corba-tss-config-2.1.xsd,openejb-jar-2.2.xsd</sourceSchemas>
<xmlConfigs>
<xmlConfig implementation="java.io.File">${basedir}/src/schema/xmlconfig.xml</xmlConfig>
</xmlConfigs>
Copied: incubator/openejb/trunk/openejb2/modules/openejb-builder/src/schema/corba-css-config-2.1.xsd (from r450979, incubator/openejb/trunk/openejb2/modules/openejb-builder/src/schema/corba-css-config-2.0.xsd)
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb2/modules/openejb-builder/src/schema/corba-css-config-2.1.xsd?view=diff&rev=451626&p1=incubator/openejb/trunk/openejb2/modules/openejb-builder/src/schema/corba-css-config-2.0.xsd&r1=450979&p2=incubator/openejb/trunk/openejb2/modules/openejb-builder/src/schema/corba-css-config-2.1.xsd&r2=451626
==============================================================================
--- incubator/openejb/trunk/openejb2/modules/openejb-builder/src/schema/corba-css-config-2.0.xsd (original)
+++ incubator/openejb/trunk/openejb2/modules/openejb-builder/src/schema/corba-css-config-2.1.xsd Sat Sep 30 10:30:07 2006
@@ -1,56 +1,27 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!-- ================================================================
- Redistribution and use of this software and associated documentation
- ("Software"), with or without modification, are permitted provided
- that the following conditions are met:
-
- 1. Redistributions of source code must retain copyright
- statements and notices. Redistributions must also contain a
- copy of this document.
-
- 2. Redistributions in binary form must reproduce this list of
- conditions and the following disclaimer in the documentation
- and/or other materials provided with the distribution.
-
- 3. The name "OpenEJB" must not be used to endorse or promote
- products derived from this Software without prior written
- permission of The OpenEJB Group. For written permission,
- please contact openejb-group@openejb.sf.net.
-
- 4. Products derived from this Software may not be called "OpenEJB"
- nor may "OpenEJB" appear in their names without prior written
- permission of The OpenEJB Group. OpenEJB is a registered
- trademark of The OpenEJB Group.
-
- 5. Due credit should be given to the OpenEJB Project
- (http://openejb.org/).
-
- THIS SOFTWARE IS PROVIDED BY THE OPENEJB GROUP AND CONTRIBUTORS
- ``AS IS'' AND ANY EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT
- NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
- FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL
- THE OPENEJB GROUP OR ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
- INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
- SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
- STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
- OF THE POSSIBILITY OF SUCH DAMAGE.
-
- ====================================================================
-
- This software consists of voluntary contributions made by many
- individuals on behalf of the OpenEJB Project. For more information
- please see <http://openejb.org/>.
-
- ================================================================ -->
+<!--
+/**
+ * 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.
+ */
+-->
<xsd:schema
- xmlns:css="http://www.openejb.org/xml/ns/corba-css-config-2.0"
- targetNamespace="http://www.openejb.org/xml/ns/corba-css-config-2.0"
+ xmlns:css="http://openejb.apache.org/xml/ns/corba-css-config-2.1"
+ targetNamespace="http://openejb.apache.org/xml/ns/corba-css-config-2.1"
xmlns:xsd="http://www.w3.org/2001/XMLSchema"
- xmlns:j2ee="http://java.sun.com/xml/ns/j2ee"
elementFormDefault="qualified"
attributeFormDefault="unqualified"
version="1.0">
Propchange: incubator/openejb/trunk/openejb2/modules/openejb-builder/src/schema/corba-css-config-2.1.xsd
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/openejb/trunk/openejb2/modules/openejb-builder/src/schema/corba-css-config-2.1.xsd
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Modified: incubator/openejb/trunk/openejb2/modules/openejb-builder/src/schema/corba-tss-config-2.1.xsd
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb2/modules/openejb-builder/src/schema/corba-tss-config-2.1.xsd?view=diff&rev=451626&r1=451625&r2=451626
==============================================================================
--- incubator/openejb/trunk/openejb2/modules/openejb-builder/src/schema/corba-tss-config-2.1.xsd (original)
+++ incubator/openejb/trunk/openejb2/modules/openejb-builder/src/schema/corba-tss-config-2.1.xsd Sat Sep 30 10:30:07 2006
@@ -1,54 +1,26 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!-- ================================================================
- Redistribution and use of this software and associated documentation
- ("Software"), with or without modification, are permitted provided
- that the following conditions are met:
-
- 1. Redistributions of source code must retain copyright
- statements and notices. Redistributions must also contain a
- copy of this document.
-
- 2. Redistributions in binary form must reproduce this list of
- conditions and the following disclaimer in the documentation
- and/or other materials provided with the distribution.
-
- 3. The name "OpenEJB" must not be used to endorse or promote
- products derived from this Software without prior written
- permission of The OpenEJB Group. For written permission,
- please contact openejb-group@openejb.sf.net.
-
- 4. Products derived from this Software may not be called "OpenEJB"
- nor may "OpenEJB" appear in their names without prior written
- permission of The OpenEJB Group. OpenEJB is a registered
- trademark of The OpenEJB Group.
-
- 5. Due credit should be given to the OpenEJB Project
- (http://openejb.org/).
-
- THIS SOFTWARE IS PROVIDED BY THE OPENEJB GROUP AND CONTRIBUTORS
- ``AS IS'' AND ANY EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT
- NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
- FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL
- THE OPENEJB GROUP OR ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
- INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
- SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
- STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
- OF THE POSSIBILITY OF SUCH DAMAGE.
-
- ====================================================================
-
- This software consists of voluntary contributions made by many
- individuals on behalf of the OpenEJB Project. For more information
- please see <http://openejb.org/>.
-
- ================================================================ -->
+<!--
+/**
+ * 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.
+ */
+-->
<xsd:schema
- xmlns:tss="http://www.openejb.org/xml/ns/corba-tss-config-2.1"
- targetNamespace="http://www.openejb.org/xml/ns/corba-tss-config-2.1"
+ xmlns:tss="http://openejb.apache.org/xml/ns/corba-tss-config-2.1"
+ targetNamespace="http://openejb.apache.org/xml/ns/corba-tss-config-2.1"
xmlns:xsd="http://www.w3.org/2001/XMLSchema"
xmlns:security="http://geronimo.apache.org/xml/ns/security-1.2"
elementFormDefault="qualified"
Modified: incubator/openejb/trunk/openejb2/modules/openejb-builder/src/schema/openejb-jar-2.2.xsd
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb2/modules/openejb-builder/src/schema/openejb-jar-2.2.xsd?view=diff&rev=451626&r1=451625&r2=451626
==============================================================================
--- incubator/openejb/trunk/openejb2/modules/openejb-builder/src/schema/openejb-jar-2.2.xsd (original)
+++ incubator/openejb/trunk/openejb2/modules/openejb-builder/src/schema/openejb-jar-2.2.xsd Sat Sep 30 10:30:07 2006
@@ -1,58 +1,30 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!-- ================================================================
- Redistribution and use of this software and associated documentation
- ("Software"), with or without modification, are permitted provided
- that the following conditions are met:
-
- 1. Redistributions of source code must retain copyright
- statements and notices. Redistributions must also contain a
- copy of this document.
-
- 2. Redistributions in binary form must reproduce this list of
- conditions and the following disclaimer in the documentation
- and/or other materials provided with the distribution.
-
- 3. The name "OpenEJB" must not be used to endorse or promote
- products derived from this Software without prior written
- permission of The OpenEJB Group. For written permission,
- please contact openejb-group@openejb.sf.net.
-
- 4. Products derived from this Software may not be called "OpenEJB"
- nor may "OpenEJB" appear in their names without prior written
- permission of The OpenEJB Group. OpenEJB is a registered
- trademark of The OpenEJB Group.
-
- 5. Due credit should be given to the OpenEJB Project
- (http://openejb.org/).
-
- THIS SOFTWARE IS PROVIDED BY THE OPENEJB GROUP AND CONTRIBUTORS
- ``AS IS'' AND ANY EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT
- NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
- FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL
- THE OPENEJB GROUP OR ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
- INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
- SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
- STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
- OF THE POSSIBILITY OF SUCH DAMAGE.
-
- ====================================================================
-
- This software consists of voluntary contributions made by many
- individuals on behalf of the OpenEJB Project. For more information
- please see <http://openejb.org/>.
-
- ================================================================ -->
+<!--
+/**
+ * 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.
+ */
+-->
<xs:schema
- xmlns:openejb="http://www.openejb.org/xml/ns/openejb-jar-2.2"
- targetNamespace="http://www.openejb.org/xml/ns/openejb-jar-2.2"
+ xmlns:openejb="http://openejb.apache.org/xml/ns/openejb-jar-2.2"
+ targetNamespace="http://openejb.apache.org/xml/ns/openejb-jar-2.2"
xmlns:naming="http://geronimo.apache.org/xml/ns/naming-1.2"
xmlns:app="http://geronimo.apache.org/xml/ns/j2ee/application-1.2"
xmlns:sys="http://geronimo.apache.org/xml/ns/deployment-1.2"
- xmlns:pkgen="http://www.openejb.org/xml/ns/pkgen-2.0"
+ xmlns:pkgen="http://openejb.apache.org/xml/ns/pkgen-2.1"
xmlns:xs="http://www.w3.org/2001/XMLSchema"
elementFormDefault="qualified"
attributeFormDefault="unqualified"
@@ -62,7 +34,7 @@
<!--<xs:import namespace="http://geronimo.apache.org/xml/ns/security-1.2" schemaLocation="geronimo-security-1.2.xsd"/>-->
<xs:import namespace="http://geronimo.apache.org/xml/ns/j2ee/application-1.2" schemaLocation="geronimo-application-1.2.xsd"/>
<xs:import namespace="http://geronimo.apache.org/xml/ns/deployment-1.2" schemaLocation="geronimo-module-1.2.xsd"/>
- <xs:import namespace="http://www.openejb.org/xml/ns/pkgen-2.0" schemaLocation="openejb-pkgen-2.0.xsd"/>
+ <xs:import namespace="http://openejb.apache.org/xml/ns/pkgen-2.1" schemaLocation="openejb-pkgen-2.1.xsd"/>
<xs:element name="openejb-jar" type="openejb:openejb-jarType"/>
Modified: incubator/openejb/trunk/openejb2/modules/openejb-builder/src/schema/resolver-catalog.xml
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb2/modules/openejb-builder/src/schema/resolver-catalog.xml?view=diff&rev=451626&r1=451625&r2=451626
==============================================================================
--- incubator/openejb/trunk/openejb2/modules/openejb-builder/src/schema/resolver-catalog.xml (original)
+++ incubator/openejb/trunk/openejb2/modules/openejb-builder/src/schema/resolver-catalog.xml Sat Sep 30 10:30:07 2006
@@ -1,3 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+/**
+ * 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.
+ */
+-->
+
<catalog xmlns="urn:oasis:names:tc:entity:xmlns:xml:catalog">
<!-- <public publicId="http://java.sun.com/xml/ns/j2ee"-->
Modified: incubator/openejb/trunk/openejb2/modules/openejb-builder/src/schema/xmlconfig.xml
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb2/modules/openejb-builder/src/schema/xmlconfig.xml?view=diff&rev=451626&r1=451625&r2=451626
==============================================================================
--- incubator/openejb/trunk/openejb2/modules/openejb-builder/src/schema/xmlconfig.xml (original)
+++ incubator/openejb/trunk/openejb2/modules/openejb-builder/src/schema/xmlconfig.xml Sat Sep 30 10:30:07 2006
@@ -1,22 +1,41 @@
-<xb:config xmlns:xb="http://www.bea.com/2002/09/xbean/config"
- >
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+/**
+ * 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.
+ */
+-->
- <xb:namespace uri="http://www.openejb.org/xml/ns/openejb-jar-2.2">
+<xb:config xmlns:xb="http://www.bea.com/2002/09/xbean/config">
+
+ <xb:namespace uri="http://openejb.apache.org/xml/ns/openejb-jar-2.2">
<xb:package>org.apache.openejb.xbeans.ejbjar</xb:package>
<xb:prefix>Openejb</xb:prefix>
</xb:namespace>
- <xb:namespace uri="http://www.openejb.org/xml/ns/pkgen-2.0">
+ <xb:namespace uri="http://openejb.apache.org/xml/ns/pkgen-2.1">
<xb:package>org.apache.openejb.xbeans.pkgen</xb:package>
<xb:prefix>Ejb</xb:prefix>
</xb:namespace>
- <xb:namespace uri="http://www.openejb.org/xml/ns/corba-tss-config-2.1">
+ <xb:namespace uri="http://openejb.apache.org/xml/ns/corba-tss-config-2.1">
<xb:package>org.apache.openejb.xbeans.csiv2.tss</xb:package>
<xb:prefix>TSS</xb:prefix>
</xb:namespace>
- <xb:namespace uri="http://www.openejb.org/xml/ns/corba-css-config-2.0">
+ <xb:namespace uri="http://openejb.apache.org/xml/ns/corba-css-config-2.1">
<xb:package>org.apache.openejb.xbeans.csiv2.css</xb:package>
<xb:prefix>CSS</xb:prefix>
</xb:namespace>
Modified: incubator/openejb/trunk/openejb2/modules/openejb-builder/src/test/java/org/apache/openejb/corba/security/config/tss/TSSConfigEditorTest.java
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb2/modules/openejb-builder/src/test/java/org/apache/openejb/corba/security/config/tss/TSSConfigEditorTest.java?view=diff&rev=451626&r1=451625&r2=451626
==============================================================================
--- incubator/openejb/trunk/openejb2/modules/openejb-builder/src/test/java/org/apache/openejb/corba/security/config/tss/TSSConfigEditorTest.java (original)
+++ incubator/openejb/trunk/openejb2/modules/openejb-builder/src/test/java/org/apache/openejb/corba/security/config/tss/TSSConfigEditorTest.java Sat Sep 30 10:30:07 2006
@@ -36,7 +36,7 @@
* @version $Revision$ $Date$
*/
public class TSSConfigEditorTest extends TestCase {
- private static final String TEST_XML1 = "<foo:tss xmlns:foo=\"http://www.openejb.org/xml/ns/corba-tss-config-2.1\">\n" +
+ private static final String TEST_XML1 = "<foo:tss xmlns:foo=\"http://openejb.apache.org/xml/ns/corba-tss-config-2.1\">\n" +
// " <foo:description>this is a foo</foo:description>" +
" <foo:SSL port=\"443\" hostname=\"corba.apache.org\">\n" +
" <foo:supports>Integrity Confidentiality EstablishTrustInTarget EstablishTrustInClient</foo:supports>\n" +
@@ -47,8 +47,8 @@
" </foo:compoundSecMech>\n" +
" </foo:compoundSecMechTypeList>\n" +
" </foo:tss>";
- private static final String TEST_XML2 = "<foo:tss inherit=\"true\" xmlns:foo=\"http://www.openejb.org/xml/ns/corba-tss-config-2.1\"/>";
- private static final String TEST_XML3 = "<tss xmlns=\"http://www.openejb.org/xml/ns/corba-tss-config-2.1\">\n" +
+ private static final String TEST_XML2 = "<foo:tss inherit=\"true\" xmlns:foo=\"http://openejb.apache.org/xml/ns/corba-tss-config-2.1\"/>";
+ private static final String TEST_XML3 = "<tss xmlns=\"http://openejb.apache.org/xml/ns/corba-tss-config-2.1\">\n" +
" <SSL port=\"443\">\n" +
" <supports>BAD_ENUM Integrity Confidentiality EstablishTrustInTarget EstablishTrustInClient</supports>\n" +
" <requires>Integrity</requires>\n" +
@@ -112,7 +112,7 @@
" iiop.TransportServerInitializerClass=org.openorb.orb.ssl.SSLTransportServerInitializer\n" +
"\n" +
" secure.server.allowUnsecure=false";
- private static final String TEST_XML4 = " <tss:tss xmlns:tss=\"http://www.openejb.org/xml/ns/corba-tss-config-2.1\" xmlns:sec=\"http://geronimo.apache.org/xml/ns/security-1.2\">\n" +
+ private static final String TEST_XML4 = " <tss:tss xmlns:tss=\"http://openejb.apache.org/xml/ns/corba-tss-config-2.1\" xmlns:sec=\"http://geronimo.apache.org/xml/ns/security-1.2\">\n" +
" <tss:default-principal>\n" +
" <sec:principal class=\"org.apache.geronimo.security.realm.providers.GeronimoUserPrincipal\" name=\"guest\"/>\n" +
" </tss:default-principal>\n" +
Modified: incubator/openejb/trunk/openejb2/modules/openejb-builder/src/test/java/org/apache/openejb/deployment/DeploymentTestSuite.java
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb2/modules/openejb-builder/src/test/java/org/apache/openejb/deployment/DeploymentTestSuite.java?view=diff&rev=451626&r1=451625&r2=451626
==============================================================================
--- incubator/openejb/trunk/openejb2/modules/openejb-builder/src/test/java/org/apache/openejb/deployment/DeploymentTestSuite.java (original)
+++ incubator/openejb/trunk/openejb2/modules/openejb-builder/src/test/java/org/apache/openejb/deployment/DeploymentTestSuite.java Sat Sep 30 10:30:07 2006
@@ -17,6 +17,7 @@
package org.apache.openejb.deployment;
import java.io.File;
+import java.io.IOException;
import java.net.URL;
import java.net.URLClassLoader;
import java.rmi.MarshalledObject;
@@ -58,15 +59,15 @@
*/
public class DeploymentTestSuite extends TestDecorator implements DeploymentTestContants {
private DeploymentHelper deploymentHelper = new DeploymentHelper();
- private final File moduleFile;
+ private final String moduleFileString;
private File tempDir;
private DataSource dataSource;
private ClassLoader applicationClassLoader;
- protected DeploymentTestSuite(Class testClass, File moduleFile) {
+ protected DeploymentTestSuite(Class testClass, String moduleFile) {
super(new TestSuite(testClass));
- this.moduleFile = moduleFile;
+ this.moduleFileString = moduleFile;
}
public Kernel getKernel() {
@@ -107,6 +108,15 @@
deploymentHelper.setUp();
ClassLoader oldCl = Thread.currentThread().getContextClassLoader();
+ File moduleFile = new File(moduleFileString);
+ JarFile jarFile = null;
+ try {
+ jarFile = DeploymentUtil.createJarFile(moduleFile);
+ } catch (IOException e) {
+ moduleFile = new File("target/" + moduleFileString);
+ jarFile = DeploymentUtil.createJarFile(moduleFile);
+
+ }
ClassLoader cl = new URLClassLoader(new URL[]{moduleFile.toURL()}, oldCl);
Thread.currentThread().setContextClassLoader(cl);
@@ -150,13 +160,11 @@
null, null, deploymentHelper.naming
);
- JarFile jarFile = null;
ConfigurationData configurationData = null;
DeploymentContext context = null;
ArtifactManager artifactManager = new DefaultArtifactManager();
ArtifactResolver artifactResolver = new DefaultArtifactResolver(artifactManager, Collections.EMPTY_SET, null);
try {
- jarFile = DeploymentUtil.createJarFile(moduleFile);
Object plan = earConfigBuilder.getDeploymentPlan(null, jarFile, new ModuleIDBuilder());
Artifact configurationId = earConfigBuilder.getConfigurationID(plan, jarFile, new ModuleIDBuilder());
context = earConfigBuilder.buildConfiguration(false, configurationId, plan, jarFile, Collections.singleton(deploymentHelper.configStore), artifactResolver, deploymentHelper.configStore);
Modified: incubator/openejb/trunk/openejb2/modules/openejb-builder/src/test/java/org/apache/openejb/deployment/EarDeploymentTest.java
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb2/modules/openejb-builder/src/test/java/org/apache/openejb/deployment/EarDeploymentTest.java?view=diff&rev=451626&r1=451625&r2=451626
==============================================================================
--- incubator/openejb/trunk/openejb2/modules/openejb-builder/src/test/java/org/apache/openejb/deployment/EarDeploymentTest.java (original)
+++ incubator/openejb/trunk/openejb2/modules/openejb-builder/src/test/java/org/apache/openejb/deployment/EarDeploymentTest.java Sat Sep 30 10:30:07 2006
@@ -16,8 +16,6 @@
*/
package org.apache.openejb.deployment;
-import java.io.File;
-
import junit.framework.Test;
import org.apache.geronimo.kernel.Kernel;
@@ -26,7 +24,7 @@
*/
public class EarDeploymentTest extends AbstractDeploymentTest {
private static final DeploymentTestSuite SUITE =
- new DeploymentTestSuite(EarDeploymentTest.class, new File("target/test-ear.ear"));
+ new DeploymentTestSuite(EarDeploymentTest.class, "test-ear.ear");
public static Test suite() {
return SUITE;
Modified: incubator/openejb/trunk/openejb2/modules/openejb-builder/src/test/java/org/apache/openejb/deployment/EjbJarModuleDeploymentTest.java
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb2/modules/openejb-builder/src/test/java/org/apache/openejb/deployment/EjbJarModuleDeploymentTest.java?view=diff&rev=451626&r1=451625&r2=451626
==============================================================================
--- incubator/openejb/trunk/openejb2/modules/openejb-builder/src/test/java/org/apache/openejb/deployment/EjbJarModuleDeploymentTest.java (original)
+++ incubator/openejb/trunk/openejb2/modules/openejb-builder/src/test/java/org/apache/openejb/deployment/EjbJarModuleDeploymentTest.java Sat Sep 30 10:30:07 2006
@@ -16,8 +16,6 @@
*/
package org.apache.openejb.deployment;
-import java.io.File;
-
import junit.framework.Test;
import org.apache.geronimo.kernel.Kernel;
@@ -26,7 +24,7 @@
*/
public class EjbJarModuleDeploymentTest extends AbstractDeploymentTest {
private static final DeploymentTestSuite SUITE =
- new DeploymentTestSuite(EjbJarModuleDeploymentTest.class, new File("target/test-ejb-jar.jar"));
+ new DeploymentTestSuite(EjbJarModuleDeploymentTest.class, "test-ejb-jar.jar");
public static Test suite() {
return SUITE;
Modified: incubator/openejb/trunk/openejb2/modules/openejb-builder/src/test/java/org/apache/openejb/deployment/UnpackedModuleDeploymentTest.java
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb2/modules/openejb-builder/src/test/java/org/apache/openejb/deployment/UnpackedModuleDeploymentTest.java?view=diff&rev=451626&r1=451625&r2=451626
==============================================================================
--- incubator/openejb/trunk/openejb2/modules/openejb-builder/src/test/java/org/apache/openejb/deployment/UnpackedModuleDeploymentTest.java (original)
+++ incubator/openejb/trunk/openejb2/modules/openejb-builder/src/test/java/org/apache/openejb/deployment/UnpackedModuleDeploymentTest.java Sat Sep 30 10:30:07 2006
@@ -16,8 +16,6 @@
*/
package org.apache.openejb.deployment;
-import java.io.File;
-
import junit.framework.Test;
import org.apache.geronimo.kernel.Kernel;
@@ -26,7 +24,7 @@
*/
public class UnpackedModuleDeploymentTest extends AbstractDeploymentTest {
private static final DeploymentTestSuite SUITE =
- new DeploymentTestSuite(UnpackedModuleDeploymentTest.class, new File("target/test-ejb-jar"));
+ new DeploymentTestSuite(UnpackedModuleDeploymentTest.class, "test-ejb-jar");
public static Test suite() {
return SUITE;
Modified: incubator/openejb/trunk/openejb2/modules/openejb-pkgen-builder/pom.xml
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb2/modules/openejb-pkgen-builder/pom.xml?view=diff&rev=451626&r1=451625&r2=451626
==============================================================================
--- incubator/openejb/trunk/openejb2/modules/openejb-pkgen-builder/pom.xml (original)
+++ incubator/openejb/trunk/openejb2/modules/openejb-pkgen-builder/pom.xml Sat Sep 30 10:30:07 2006
@@ -69,7 +69,7 @@
</goals>
<configuration>
<schemaDirectory>${basedir}/src/schema</schemaDirectory>
- <sourceSchemas>openejb-pkgen-2.0.xsd</sourceSchemas>
+ <sourceSchemas>openejb-pkgen-2.1.xsd</sourceSchemas>
<xmlConfigs>
<xmlConfig implementation="java.io.File">${basedir}/src/schema/xmlconfig.xml</xmlConfig>
</xmlConfigs>
Copied: incubator/openejb/trunk/openejb2/modules/openejb-pkgen-builder/src/schema/openejb-pkgen-2.1.xsd (from r450979, incubator/openejb/trunk/openejb2/modules/openejb-pkgen-builder/src/schema/openejb-pkgen-2.0.xsd)
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb2/modules/openejb-pkgen-builder/src/schema/openejb-pkgen-2.1.xsd?view=diff&rev=451626&p1=incubator/openejb/trunk/openejb2/modules/openejb-pkgen-builder/src/schema/openejb-pkgen-2.0.xsd&r1=450979&p2=incubator/openejb/trunk/openejb2/modules/openejb-pkgen-builder/src/schema/openejb-pkgen-2.1.xsd&r2=451626
==============================================================================
--- incubator/openejb/trunk/openejb2/modules/openejb-pkgen-builder/src/schema/openejb-pkgen-2.0.xsd (original)
+++ incubator/openejb/trunk/openejb2/modules/openejb-pkgen-builder/src/schema/openejb-pkgen-2.1.xsd Sat Sep 30 10:30:07 2006
@@ -1,56 +1,28 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!-- ================================================================
-Redistribution and use of this software and associated documentation
-("Software"), with or without modification, are permitted provided
-that the following conditions are met:
-
-1. Redistributions of source code must retain copyright
-statements and notices. Redistributions must also contain a
-copy of this document.
-
-2. Redistributions in binary form must reproduce this list of
-conditions and the following disclaimer in the documentation
-and/or other materials provided with the distribution.
-
-3. The name "OpenEJB" must not be used to endorse or promote
-products derived from this Software without prior written
-permission of The OpenEJB Group. For written permission,
-please contact openejb-group@openejb.sf.net.
-
-4. Products derived from this Software may not be called "OpenEJB"
-nor may "OpenEJB" appear in their names without prior written
-permission of The OpenEJB Group. OpenEJB is a registered
-trademark of The OpenEJB Group.
-
-5. Due credit should be given to the OpenEJB Project
-(http://openejb.org/).
-
-THIS SOFTWARE IS PROVIDED BY THE OPENEJB GROUP AND CONTRIBUTORS
-``AS IS'' AND ANY EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT
-NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
-FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL
-THE OPENEJB GROUP OR ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
-INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
-SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
-STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
-OF THE POSSIBILITY OF SUCH DAMAGE.
-
-====================================================================
-
-This software consists of voluntary contributions made by many
-individuals on behalf of the OpenEJB Project. For more information
-please see <http://openejb.org/>.
-
-================================================================ -->
+<!--
+/**
+ * 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.
+ */
+-->
<xsd:schema
xmlns:xsd="http://www.w3.org/2001/XMLSchema"
xmlns:j2ee="http://java.sun.com/xml/ns/j2ee"
- xmlns:pkgen="http://www.openejb.org/xml/ns/pkgen-2.0"
- targetNamespace="http://www.openejb.org/xml/ns/pkgen-2.0"
+ xmlns:pkgen="http://openejb.apache.org/xml/ns/pkgen-2.1"
+ targetNamespace="http://openejb.apache.org/xml/ns/pkgen-2.1"
elementFormDefault="qualified"
attributeFormDefault="unqualified"
version="1.0">
Propchange: incubator/openejb/trunk/openejb2/modules/openejb-pkgen-builder/src/schema/openejb-pkgen-2.1.xsd
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/openejb/trunk/openejb2/modules/openejb-pkgen-builder/src/schema/openejb-pkgen-2.1.xsd
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Modified: incubator/openejb/trunk/openejb2/modules/openejb-pkgen-builder/src/schema/xmlconfig.xml
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb2/modules/openejb-pkgen-builder/src/schema/xmlconfig.xml?view=diff&rev=451626&r1=451625&r2=451626
==============================================================================
--- incubator/openejb/trunk/openejb2/modules/openejb-pkgen-builder/src/schema/xmlconfig.xml (original)
+++ incubator/openejb/trunk/openejb2/modules/openejb-pkgen-builder/src/schema/xmlconfig.xml Sat Sep 30 10:30:07 2006
@@ -1,6 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+/**
+ * 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.
+ */
+-->
+
<xb:config xmlns:xb="http://www.bea.com/2002/09/xbean/config">
- <xb:namespace uri="http://www.openejb.org/xml/ns/pkgen-2.0">
+ <xb:namespace uri="http://openejb.apache.org/xml/ns/pkgen-2.1">
<xb:package>org.apache.openejb.xbeans.pkgen</xb:package>
<xb:prefix>Ejb</xb:prefix>
</xb:namespace>