You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by sp...@apache.org on 2005/10/29 01:18:08 UTC
svn commit: r329329 - in
/geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.deployment.model:
build.xml maven.xml
Author: sppatel
Date: Fri Oct 28 16:18:05 2005
New Revision: 329329
URL: http://svn.apache.org/viewcvs?rev=329329&view=rev
Log:
security schema version change to 1.1
Modified:
geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.deployment.model/build.xml
geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.deployment.model/maven.xml
Modified: geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.deployment.model/build.xml
URL: http://svn.apache.org/viewcvs/geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.deployment.model/build.xml?rev=329329&r1=329328&r2=329329&view=diff
==============================================================================
--- geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.deployment.model/build.xml (original)
+++ geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.deployment.model/build.xml Fri Oct 28 16:18:05 2005
@@ -1,102 +1,102 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project default="codegen" basedir=".">
- <dirname property="antfile.dir" file="${ant.file}"/>
-
- <!-- Global properties -->
- <property name="project.directory" location="${basedir}"/>
- <property name="source.directory" value="src"/>
- <property name="target.directory" location="${basedir}/target"/>
- <property name="con" value='<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>'/>
-
- <target name="codegen">
- <!-- A macrodef makes it easier to generate code for multiple models in one script. -->
- <macrodef name="multipleXSDs2Java">
- <attribute name="genModelName"/>
- <element name="settings"/>
- <sequential>
- <emf.XSD2Java
- genModel="${target.directory}/emf/@{genModelName}.genmodel"
- modelProject="${project.directory}"
- modelProjectFragmentPath="${source.directory}"
- modelPluginID="org.apache.geronimo.deployment.model"
- copyright="">
- <settings/>
- </emf.XSD2Java>
- </sequential>
- </macrodef>
-
- <!-- Workaround for EMF output folder override issue. -->
- <multipleXSDs2Java genModelName="dummy">
- <settings>
- <model file="dummy.xsd"/>
- </settings>
- </multipleXSDs2Java>
-
- <replace file=".classpath" token='path="bin"/>' value='path="target/classes"/>${con}'/>
-
- <multipleXSDs2Java genModelName="geronimo-web">
- <settings>
- <model file="${target.directory}/schema/geronimo-web-1.0.xsd"/>
- <arg line="-packageMap http://geronimo.apache.org/xml/ns/naming-1.0 org.apache.geronimo.xml.ns.naming"/>
- <arg line="-packageMap http://geronimo.apache.org/xml/ns/security-1.0 org.apache.geronimo.xml.ns.security"/>
- <arg line="-packageMap http://geronimo.apache.org/xml/ns/deployment-1.0 org.apache.geronimo.xml.ns.deployment"/>
- <arg line="-packageMap http://geronimo.apache.org/xml/ns/j2ee/web-1.0 org.apache.geronimo.xml.ns.web"/>
-
- <arg line="-packages http://geronimo.apache.org/xml/ns/naming-1.0"/>
- <arg line="-packages http://geronimo.apache.org/xml/ns/security-1.0"/>
- <arg line="-packages http://geronimo.apache.org/xml/ns/deployment-1.0"/>
- <arg line="-packages http://geronimo.apache.org/xml/ns/j2ee/web-1.0"/>
- </settings>
- </multipleXSDs2Java>
-
- <multipleXSDs2Java genModelName="geronimo-application">
- <settings>
- <model file="${target.directory}/schema/geronimo-application-1.0.xsd"/>
- <arg line="-packageMap http://geronimo.apache.org/xml/ns/j2ee/application-1.0 org.apache.geronimo.xml.ns.j2ee.application"/>
- <arg line="-packageMap http://geronimo.apache.org/xml/ns/security-1.0 org.apache.geronimo.xml.ns.security"/>
- <arg line="-packageMap http://geronimo.apache.org/xml/ns/deployment-1.0 org.apache.geronimo.xml.ns.deployment"/>
-
- <arg line="-packages http://geronimo.apache.org/xml/ns/j2ee/application-1.0"/>
- </settings>
- </multipleXSDs2Java>
-
- <multipleXSDs2Java genModelName="openejb-jar">
- <settings>
- <model file="${target.directory}/schema/openejb-jar-2.0.xsd"/>
- <arg line="-packageMap http://geronimo.apache.org/xml/ns/naming-1.0 org.apache.geronimo.xml.ns.naming"/>
- <arg line="-packageMap http://geronimo.apache.org/xml/ns/security-1.0 org.apache.geronimo.xml.ns.security"/>
- <arg line="-packageMap http://geronimo.apache.org/xml/ns/deployment-1.0 org.apache.geronimo.xml.ns.deployment"/>
- <arg line="-packageMap http://www.openejb.org/xml/ns/openejb-jar-2.0 org.openejb.xml.ns.openejb.jar"/>
- <arg line="-packageMap http://www.openejb.org/xml/ns/pkgen-2.0 org.openejb.xml.ns.pkgen"/>
-
- <arg line="-packages http://www.openejb.org/xml/ns/openejb-jar-2.0"/>
- <arg line="-packages http://www.openejb.org/xml/ns/pkgen-2.0"/>
- </settings>
- </multipleXSDs2Java>
-
- <multipleXSDs2Java genModelName="geronimo-connector">
- <settings>
- <model file="${target.directory}/schema/geronimo-connector-1.0.xsd"/>
- <arg line="-packageMap http://geronimo.apache.org/xml/ns/j2ee/connector-1.0 org.apache.geronimo.xml.ns.j2ee.connector"/>
- <arg line="-packageMap http://geronimo.apache.org/xml/ns/naming-1.0 org.apache.geronimo.xml.ns.naming"/>
- <arg line="-packageMap http://geronimo.apache.org/xml/ns/deployment-1.0 org.apache.geronimo.xml.ns.deployment"/>
-
- <arg line="-packages http://geronimo.apache.org/xml/ns/j2ee/connector-1.0"/>
- </settings>
- </multipleXSDs2Java>
-
- <multipleXSDs2Java genModelName="geronimo-application-client">
- <settings>
- <model file="${target.directory}/schema/geronimo-application-client-1.0.xsd"/>
- <arg line="-packageMap http://geronimo.apache.org/xml/ns/j2ee/application-client-1.0 org.apache.geronimo.xml.ns.j2ee.application.client"/>
- <arg line="-packageMap http://geronimo.apache.org/xml/ns/naming-1.0 org.apache.geronimo.xml.ns.naming"/>
- <arg line="-packageMap http://geronimo.apache.org/xml/ns/security-1.0 org.apache.geronimo.xml.ns.security"/>
- <arg line="-packageMap http://geronimo.apache.org/xml/ns/j2ee/connector-1.0 org.apache.geronimo.xml.ns.j2ee.connector"/>
- <arg line="-packageMap http://geronimo.apache.org/xml/ns/deployment-1.0 org.apache.geronimo.xml.ns.deployment"/>
-
- <arg line="-packages http://geronimo.apache.org/xml/ns/j2ee/application-client-1.0"/>
- </settings>
- </multipleXSDs2Java>
-
- </target>
-</project>
\ No newline at end of file
+<?xml version="1.0" encoding="UTF-8"?>
+<project default="codegen" basedir=".">
+ <dirname property="antfile.dir" file="${ant.file}"/>
+
+ <!-- Global properties -->
+ <property name="project.directory" location="${basedir}"/>
+ <property name="source.directory" value="src"/>
+ <property name="target.directory" location="${basedir}/target"/>
+ <property name="con" value='<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>'/>
+
+ <target name="codegen">
+ <!-- A macrodef makes it easier to generate code for multiple models in one script. -->
+ <macrodef name="multipleXSDs2Java">
+ <attribute name="genModelName"/>
+ <element name="settings"/>
+ <sequential>
+ <emf.XSD2Java
+ genModel="${target.directory}/emf/@{genModelName}.genmodel"
+ modelProject="${project.directory}"
+ modelProjectFragmentPath="${source.directory}"
+ modelPluginID="org.apache.geronimo.deployment.model"
+ copyright="">
+ <settings/>
+ </emf.XSD2Java>
+ </sequential>
+ </macrodef>
+
+ <!-- Workaround for EMF output folder override issue. -->
+ <multipleXSDs2Java genModelName="dummy">
+ <settings>
+ <model file="dummy.xsd"/>
+ </settings>
+ </multipleXSDs2Java>
+
+ <replace file=".classpath" token='path="bin"/>' value='path="target/classes"/>${con}'/>
+
+ <multipleXSDs2Java genModelName="geronimo-web">
+ <settings>
+ <model file="${target.directory}/schema/geronimo-web-1.0.xsd"/>
+ <arg line="-packageMap http://geronimo.apache.org/xml/ns/naming-1.0 org.apache.geronimo.xml.ns.naming"/>
+ <arg line="-packageMap http://geronimo.apache.org/xml/ns/security-1.1 org.apache.geronimo.xml.ns.security"/>
+ <arg line="-packageMap http://geronimo.apache.org/xml/ns/deployment-1.0 org.apache.geronimo.xml.ns.deployment"/>
+ <arg line="-packageMap http://geronimo.apache.org/xml/ns/j2ee/web-1.0 org.apache.geronimo.xml.ns.web"/>
+
+ <arg line="-packages http://geronimo.apache.org/xml/ns/naming-1.0"/>
+ <arg line="-packages http://geronimo.apache.org/xml/ns/security-1.1"/>
+ <arg line="-packages http://geronimo.apache.org/xml/ns/deployment-1.0"/>
+ <arg line="-packages http://geronimo.apache.org/xml/ns/j2ee/web-1.0"/>
+ </settings>
+ </multipleXSDs2Java>
+
+ <multipleXSDs2Java genModelName="geronimo-application">
+ <settings>
+ <model file="${target.directory}/schema/geronimo-application-1.0.xsd"/>
+ <arg line="-packageMap http://geronimo.apache.org/xml/ns/j2ee/application-1.0 org.apache.geronimo.xml.ns.j2ee.application"/>
+ <arg line="-packageMap http://geronimo.apache.org/xml/ns/security-1.1 org.apache.geronimo.xml.ns.security"/>
+ <arg line="-packageMap http://geronimo.apache.org/xml/ns/deployment-1.0 org.apache.geronimo.xml.ns.deployment"/>
+
+ <arg line="-packages http://geronimo.apache.org/xml/ns/j2ee/application-1.0"/>
+ </settings>
+ </multipleXSDs2Java>
+
+ <multipleXSDs2Java genModelName="openejb-jar">
+ <settings>
+ <model file="${target.directory}/schema/openejb-jar-2.0.xsd"/>
+ <arg line="-packageMap http://geronimo.apache.org/xml/ns/naming-1.0 org.apache.geronimo.xml.ns.naming"/>
+ <arg line="-packageMap http://geronimo.apache.org/xml/ns/security-1.1 org.apache.geronimo.xml.ns.security"/>
+ <arg line="-packageMap http://geronimo.apache.org/xml/ns/deployment-1.0 org.apache.geronimo.xml.ns.deployment"/>
+ <arg line="-packageMap http://www.openejb.org/xml/ns/openejb-jar-2.0 org.openejb.xml.ns.openejb.jar"/>
+ <arg line="-packageMap http://www.openejb.org/xml/ns/pkgen-2.0 org.openejb.xml.ns.pkgen"/>
+
+ <arg line="-packages http://www.openejb.org/xml/ns/openejb-jar-2.0"/>
+ <arg line="-packages http://www.openejb.org/xml/ns/pkgen-2.0"/>
+ </settings>
+ </multipleXSDs2Java>
+
+ <multipleXSDs2Java genModelName="geronimo-connector">
+ <settings>
+ <model file="${target.directory}/schema/geronimo-connector-1.0.xsd"/>
+ <arg line="-packageMap http://geronimo.apache.org/xml/ns/j2ee/connector-1.0 org.apache.geronimo.xml.ns.j2ee.connector"/>
+ <arg line="-packageMap http://geronimo.apache.org/xml/ns/naming-1.0 org.apache.geronimo.xml.ns.naming"/>
+ <arg line="-packageMap http://geronimo.apache.org/xml/ns/deployment-1.0 org.apache.geronimo.xml.ns.deployment"/>
+
+ <arg line="-packages http://geronimo.apache.org/xml/ns/j2ee/connector-1.0"/>
+ </settings>
+ </multipleXSDs2Java>
+
+ <multipleXSDs2Java genModelName="geronimo-application-client">
+ <settings>
+ <model file="${target.directory}/schema/geronimo-application-client-1.0.xsd"/>
+ <arg line="-packageMap http://geronimo.apache.org/xml/ns/j2ee/application-client-1.0 org.apache.geronimo.xml.ns.j2ee.application.client"/>
+ <arg line="-packageMap http://geronimo.apache.org/xml/ns/naming-1.0 org.apache.geronimo.xml.ns.naming"/>
+ <arg line="-packageMap http://geronimo.apache.org/xml/ns/security-1.1 org.apache.geronimo.xml.ns.security"/>
+ <arg line="-packageMap http://geronimo.apache.org/xml/ns/j2ee/connector-1.0 org.apache.geronimo.xml.ns.j2ee.connector"/>
+ <arg line="-packageMap http://geronimo.apache.org/xml/ns/deployment-1.0 org.apache.geronimo.xml.ns.deployment"/>
+
+ <arg line="-packages http://geronimo.apache.org/xml/ns/j2ee/application-client-1.0"/>
+ </settings>
+ </multipleXSDs2Java>
+
+ </target>
+</project>
Modified: geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.deployment.model/maven.xml
URL: http://svn.apache.org/viewcvs/geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.deployment.model/maven.xml?rev=329329&r1=329328&r2=329329&view=diff
==============================================================================
--- geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.deployment.model/maven.xml (original)
+++ geronimo/devtools/trunk/modules/eclipse-plugin/plugins/org.apache.geronimo.deployment.model/maven.xml Fri Oct 28 16:18:05 2005
@@ -1,93 +1,93 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!--
-
- Copyright 2004 The Apache Software Foundation
-
- Licensed 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.
--->
-<project default="default" xmlns:j="jelly:core" xmlns:ant="jelly:ant">
-
- <goal name="default">
- <attainGoal name="build"/>
- </goal>
-
- <goal name="build">
- <attainGoal name="jar:install"/>
- </goal>
-
- <preGoal name="java:compile">
- <attainGoal name="codegen"/>
- </preGoal>
-
- <goal name="rebuild">
- <attainGoal name="clean"/>
- <attainGoal name="build"/>
- </goal>
-
- <goal name="eclipse:generate-classpath">
- <!-- do nothing -->
- </goal>
-
- <goal name="importschemas">
- <j:forEach var="artifact" items="${pom.artifacts}">
- <j:set var="group" value="${artifact.dependency.groupId}"/>
- <j:if test="${group.equals('geronimo') || group.equals('openejb')}">
- <ant:unzip src="${artifact.path}" dest="${maven.build.dir}/temp">
- <ant:patternset>
- <ant:include name="META-INF/schema/*.xsd"/>
- <ant:include name="**/xml.xsd"/>
- </ant:patternset>
- </ant:unzip>
- </j:if>
- </j:forEach>
-
- <ant:move todir="${maven.build.dir}/schema" flatten="true">
- <ant:fileset dir="${maven.build.dir}/temp/">
- <ant:include name="**/*.xsd"/>
- </ant:fileset>
- </ant:move>
-
- <ant:delete dir="${maven.build.dir}/temp"/>
-
- <!-- update include paths in all schemas -->
- <ant:fileScanner var="schemaScanner">
- <ant:fileset dir="${maven.build.dir}/schema">
- <ant:include name="*.xsd"/>
- </ant:fileset>
- </ant:fileScanner>
- <j:forEach var="schema" items="${schemaScanner.iterator()}">
- <replaceregexp file="${schema}" match="schemaLocation="(.*/)(.*xsd)" replace="schemaLocation="\2" byline="true"/>
- <j:if test="${schema.getName().equals('geronimo-connector-1.0.xsd')}">
- <replaceregexp file="${schema}" match="(xs:import.*/>)" replace="\1${patch}"/>
- </j:if>
- <j:if test="${schema.getName().equals('geronimo-security-1.0.xsd')}">
- <replaceregexp file="${schema}" match='(version="1.0">)' replace="\1${patch2}"/>
- </j:if>
- </j:forEach>
- </goal>
-
- <goal name="codegen" prereqs="importschemas">
- <echo>Starting Workbench...</echo>
- <ant:java fork="true" jar="${eclipse.home}/startup.jar" failonerror="true">
- <ant:jvmarg value="-Djava.endorsed.dirs=${maven.repo.local}/xerces/jars/"/>
- <ant:arg value="-data"/>
- <ant:arg value="../temp"/>
- <ant:arg value="-application"/>
- <ant:arg value="org.eclipse.ant.core.antRunner"/>
- <ant:arg value="-buildfile"/>
- <ant:arg value="${basedir}/build.xml"/>
- </ant:java>
- <ant:delete dir="bin"/>
- </goal>
-
-</project>
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!--
+
+ Copyright 2004 The Apache Software Foundation
+
+ Licensed 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.
+-->
+<project default="default" xmlns:j="jelly:core" xmlns:ant="jelly:ant">
+
+ <goal name="default">
+ <attainGoal name="build"/>
+ </goal>
+
+ <goal name="build">
+ <attainGoal name="jar:install"/>
+ </goal>
+
+ <preGoal name="java:compile">
+ <attainGoal name="codegen"/>
+ </preGoal>
+
+ <goal name="rebuild">
+ <attainGoal name="clean"/>
+ <attainGoal name="build"/>
+ </goal>
+
+ <goal name="eclipse:generate-classpath">
+ <!-- do nothing -->
+ </goal>
+
+ <goal name="importschemas">
+ <j:forEach var="artifact" items="${pom.artifacts}">
+ <j:set var="group" value="${artifact.dependency.groupId}"/>
+ <j:if test="${group.equals('geronimo') || group.equals('openejb')}">
+ <ant:unzip src="${artifact.path}" dest="${maven.build.dir}/temp">
+ <ant:patternset>
+ <ant:include name="META-INF/schema/*.xsd"/>
+ <ant:include name="**/xml.xsd"/>
+ </ant:patternset>
+ </ant:unzip>
+ </j:if>
+ </j:forEach>
+
+ <ant:move todir="${maven.build.dir}/schema" flatten="true">
+ <ant:fileset dir="${maven.build.dir}/temp/">
+ <ant:include name="**/*.xsd"/>
+ </ant:fileset>
+ </ant:move>
+
+ <ant:delete dir="${maven.build.dir}/temp"/>
+
+ <!-- update include paths in all schemas -->
+ <ant:fileScanner var="schemaScanner">
+ <ant:fileset dir="${maven.build.dir}/schema">
+ <ant:include name="*.xsd"/>
+ </ant:fileset>
+ </ant:fileScanner>
+ <j:forEach var="schema" items="${schemaScanner.iterator()}">
+ <replaceregexp file="${schema}" match="schemaLocation="(.*/)(.*xsd)" replace="schemaLocation="\2" byline="true"/>
+ <j:if test="${schema.getName().equals('geronimo-connector-1.0.xsd')}">
+ <replaceregexp file="${schema}" match="(xs:import.*/>)" replace="\1${patch}"/>
+ </j:if>
+ <j:if test="${schema.getName().equals('geronimo-security-1.1.xsd')}">
+ <replaceregexp file="${schema}" match='(version="1.0">)' replace="\1${patch2}"/>
+ </j:if>
+ </j:forEach>
+ </goal>
+
+ <goal name="codegen" prereqs="importschemas">
+ <echo>Starting Workbench...</echo>
+ <ant:java fork="true" jar="${eclipse.home}/startup.jar" failonerror="true">
+ <ant:jvmarg value="-Djava.endorsed.dirs=${maven.repo.local}/xerces/jars/"/>
+ <ant:arg value="-data"/>
+ <ant:arg value="../temp"/>
+ <ant:arg value="-application"/>
+ <ant:arg value="org.eclipse.ant.core.antRunner"/>
+ <ant:arg value="-buildfile"/>
+ <ant:arg value="${basedir}/build.xml"/>
+ </ant:java>
+ <ant:delete dir="bin"/>
+ </goal>
+
+</project>