Return-Path: 
 <scm-return-31536-apmail-geronimo-scm-archive=geronimo.apache.org@geronimo.apache.org>
Delivered-To: apmail-geronimo-scm-archive@www.apache.org
Received: (qmail 99965 invoked from network); 9 Sep 2008 18:43:01 -0000
Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2)
  by minotaur.apache.org with SMTP; 9 Sep 2008 18:43:01 -0000
Received: (qmail 34392 invoked by uid 500); 9 Sep 2008 18:42:58 -0000
Delivered-To: apmail-geronimo-scm-archive@geronimo.apache.org
Received: (qmail 34342 invoked by uid 500); 9 Sep 2008 18:42:58 -0000
Mailing-List: contact scm-help@geronimo.apache.org; run by ezmlm
Precedence: bulk
list-help: <mailto:scm-help@geronimo.apache.org>
list-unsubscribe: <mailto:scm-unsubscribe@geronimo.apache.org>
List-Post: <mailto:scm@geronimo.apache.org>
Reply-To: dev@geronimo.apache.org
List-Id: <scm.geronimo.apache.org>
Delivered-To: mailing list scm@geronimo.apache.org
Received: (qmail 34333 invoked by uid 99); 9 Sep 2008 18:42:58 -0000
Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136)
    by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 09 Sep 2008 11:42:58 -0700
X-ASF-Spam-Status: No, hits=-2000.0 required=10.0
	tests=ALL_TRUSTED
X-Spam-Check-By: apache.org
Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4)
    by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 09 Sep 2008 18:42:08 +0000
Received: by eris.apache.org (Postfix, from userid 65534)
	id 7290123889BB; Tue,  9 Sep 2008 11:42:40 -0700 (PDT)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r693554 - in /geronimo/server/trunk:
 assemblies/geronimo-boilerplate/ plugins/openejb/openejb/
 plugins/openejb/openejb/src/main/resources/
 plugins/openejb/openejb/src/main/resources/schema/
Date: Tue, 09 Sep 2008 18:42:38 -0000
To: scm@geronimo.apache.org
From: gawor@apache.org
X-Mailer: svnmailer-1.0.8
Message-Id: <20080909184240.7290123889BB@eris.apache.org>
X-Virus-Checked: Checked by ClamAV on apache.org

Author: gawor
Date: Tue Sep  9 11:42:38 2008
New Revision: 693554

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

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

Modified: geronimo/server/trunk/assemblies/geronimo-boilerplate/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/assemblies/geronimo-boilerplate/pom.xml?rev=693554&r1=693553&r2=693554&view=diff
==============================================================================
--- geronimo/server/trunk/assemblies/geronimo-boilerplate/pom.xml (original)
+++ geronimo/server/trunk/assemblies/geronimo-boilerplate/pom.xml Tue Sep  9 11:42:38 2008
@@ -278,9 +278,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" />
-                                <echo>copy fileset dir=${project.build.directory}/schema todir=${project.build.outputDirectory}/contents/schema</echo>
                                 <copy todir="${project.build.outputDirectory}/contents/schema">
                                     <fileset dir="${project.build.directory}/schema">
                                         <include name="**/*.xsd"/>

Modified: geronimo/server/trunk/plugins/openejb/openejb/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/openejb/openejb/pom.xml?rev=693554&r1=693553&r2=693554&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/openejb/openejb/pom.xml (original)
+++ geronimo/server/trunk/plugins/openejb/openejb/pom.xml Tue Sep  9 11:42:38 2008
@@ -172,6 +172,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/trunk/plugins/openejb/openejb/src/main/resources/schema/openejb-jar-2.2.xsd (from r693544, geronimo/server/trunk/plugins/openejb/openejb/src/main/resources/openejb-jar-2.2.xsd)
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/openejb/openejb/src/main/resources/schema/openejb-jar-2.2.xsd?p2=geronimo/server/trunk/plugins/openejb/openejb/src/main/resources/schema/openejb-jar-2.2.xsd&p1=geronimo/server/trunk/plugins/openejb/openejb/src/main/resources/openejb-jar-2.2.xsd&r1=693544&r2=693554&rev=693554&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/openejb/openejb/src/main/resources/openejb-jar-2.2.xsd (original)
+++ geronimo/server/trunk/plugins/openejb/openejb/src/main/resources/schema/openejb-jar-2.2.xsd Tue Sep  9 11:42:38 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">