geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ga...@apache.org
Subject svn commit: r693567 - in /geronimo/server/branches/2.1: assemblies/geronimo-boilerplate-minimal/ plugins/openejb/openejb/ plugins/openejb/openejb/src/main/resources/ plugins/openejb/openejb/src/main/resources/schema/
Date Tue, 09 Sep 2008 19:09:38 GMT
Author: gawor
Date: Tue Sep  9 12:09:37 2008
New Revision: 693567

URL: http://svn.apache.org/viewvc?rev=693567&view=rev
Log:
install openejb-jar-2.2.xsd using plugin infrastructure (GERONIMO-4276)

Added:
    geronimo/server/branches/2.1/plugins/openejb/openejb/src/main/resources/schema/
    geronimo/server/branches/2.1/plugins/openejb/openejb/src/main/resources/schema/openejb-jar-2.2.xsd
      - copied, changed from r693556, geronimo/server/branches/2.1/plugins/openejb/openejb/src/main/resources/openejb-jar-2.2.xsd
Removed:
    geronimo/server/branches/2.1/plugins/openejb/openejb/src/main/resources/openejb-jar-2.2.xsd
Modified:
    geronimo/server/branches/2.1/assemblies/geronimo-boilerplate-minimal/pom.xml
    geronimo/server/branches/2.1/plugins/openejb/openejb/pom.xml

Modified: geronimo/server/branches/2.1/assemblies/geronimo-boilerplate-minimal/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/assemblies/geronimo-boilerplate-minimal/pom.xml?rev=693567&r1=693566&r2=693567&view=diff
==============================================================================
--- geronimo/server/branches/2.1/assemblies/geronimo-boilerplate-minimal/pom.xml (original)
+++ geronimo/server/branches/2.1/assemblies/geronimo-boilerplate-minimal/pom.xml Tue Sep 
9 12:09:37 2008
@@ -281,8 +281,6 @@
                         <configuration>
                             <tasks>
                                 <mkdir dir="${project.build.outputDirectory}/contents/schema"/>
-                                <echo>copy file=../../plugins/openejb/openejb/src/main/resources/openejb-jar-2.2.xsd
todir=${project.build.outputDirectory}/contents/schema</echo>
-                                <copy file="../../plugins/openejb/openejb/src/main/resources/openejb-jar-2.2.xsd"
todir="${project.build.outputDirectory}/contents/schema" />
                                 <copy todir="${project.build.outputDirectory}/contents/schema">
                                     <fileset dir="${project.build.directory}/schema">
                                         <include name="**/*.xsd"/>

Modified: geronimo/server/branches/2.1/plugins/openejb/openejb/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/plugins/openejb/openejb/pom.xml?rev=693567&r1=693566&r2=693567&view=diff
==============================================================================
--- geronimo/server/branches/2.1/plugins/openejb/openejb/pom.xml (original)
+++ geronimo/server/branches/2.1/plugins/openejb/openejb/pom.xml Tue Sep  9 12:09:37 2008
@@ -161,6 +161,7 @@
                                 </gbean>
                             </config-xml-content>
                             <config-substitution key="OpenEJBPort">4201</config-substitution>
+                            <copy-file relative-to="geronimo" dest-dir="">schema</copy-file>
                         </plugin-artifact>
                     </instance>
                 </configuration>

Copied: geronimo/server/branches/2.1/plugins/openejb/openejb/src/main/resources/schema/openejb-jar-2.2.xsd
(from r693556, geronimo/server/branches/2.1/plugins/openejb/openejb/src/main/resources/openejb-jar-2.2.xsd)
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/plugins/openejb/openejb/src/main/resources/schema/openejb-jar-2.2.xsd?p2=geronimo/server/branches/2.1/plugins/openejb/openejb/src/main/resources/schema/openejb-jar-2.2.xsd&p1=geronimo/server/branches/2.1/plugins/openejb/openejb/src/main/resources/openejb-jar-2.2.xsd&r1=693556&r2=693567&rev=693567&view=diff
==============================================================================
--- geronimo/server/branches/2.1/plugins/openejb/openejb/src/main/resources/openejb-jar-2.2.xsd
(original)
+++ geronimo/server/branches/2.1/plugins/openejb/openejb/src/main/resources/schema/openejb-jar-2.2.xsd
Tue Sep  9 12:09:37 2008
@@ -1,4 +1,23 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<!--
+/**
+  * 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 elementFormDefault="qualified" version="1.0" targetNamespace="http://openejb.apache.org/xml/ns/openejb-jar-2.2"
xmlns:o="http://openejb.apache.org/xml/ns/openejb-jar-2.2" xmlns:tns="http://openejb.apache.org/xml/ns/openejb-jar-2.2"
xmlns:pkgen="http://openejb.apache.org/xml/ns/pkgen-2.1" xmlns:sys="http://geronimo.apache.org/xml/ns/deployment-1.2"
xmlns:naming="http://geronimo.apache.org/xml/ns/naming-1.2" xmlns:ns1="http://geronimo.apache.org/xml/ns/security-2.0"
xmlns:app="http://geronimo.apache.org/xml/ns/j2ee/application-1.2" xmlns:xs="http://www.w3.org/2001/XMLSchema">
 
   <xs:element name="jndi">



Mime
View raw message