You are viewing a plain text version of this content. The canonical link for it is here.
Posted to wsrf-dev@ws.apache.org by ip...@apache.org on 2004/12/05 19:03:34 UTC
svn commit: r109894 - in incubator/apollo/trunk: . jndi-config jndi-config/schema jndi-config/src jndi-config/src/schema
Author: ips
Date: Sun Dec 5 10:03:32 2004
New Revision: 109894
URL: http://svn.apache.org/viewcvs?view=rev&rev=109894
Log:
changed jndi-config artifact id to apollo-jndi-config; modified its maven.xml so standard jar:jar target builds the jar and so that a src jar also gets built
Added:
incubator/apollo/trunk/jndi-config/src/
incubator/apollo/trunk/jndi-config/src/schema/
incubator/apollo/trunk/jndi-config/src/schema/jndi-schema.xsd
Removed:
incubator/apollo/trunk/jndi-config/schema/
Modified:
incubator/apollo/trunk/jndi-config/maven.xml
incubator/apollo/trunk/jndi-config/project.xml
incubator/apollo/trunk/project.xml
Modified: incubator/apollo/trunk/jndi-config/maven.xml
Url: http://svn.apache.org/viewcvs/incubator/apollo/trunk/jndi-config/maven.xml?view=diff&rev=109894&p1=incubator/apollo/trunk/jndi-config/maven.xml&r1=109893&p2=incubator/apollo/trunk/jndi-config/maven.xml&r2=109894
==============================================================================
--- incubator/apollo/trunk/jndi-config/maven.xml (original)
+++ incubator/apollo/trunk/jndi-config/maven.xml Sun Dec 5 10:03:32 2004
@@ -6,31 +6,59 @@
* http://jakarta.apache.org/commons/jelly/tags.html
-->
-<project default="jars"
+<project default="jars"
+ xmlns:j="jelly:core"
xmlns:maven="jelly:maven">
- <property environment="env" />
- <property name="gen.src.dir" location="${maven.build.dir}/generated" />
+
<postGoal name="java:compile">
<attainGoal name="generate" />
</postGoal>
+
+ <postGoal name="jar:jar">
+ <attainGoal name="src-jar"/>
+ </postGoal>
<goal name="generate"
- description="JNDI-Config XmlBean Generation">
+ description="generate JNDI-Config XmlBeans">
- <taskdef name="xmlbean" classname="org.apache.xmlbeans.impl.tool.XMLBean">
- <classpath>
- <path refid="maven.dependency.classpath" />
- </classpath>
- </taskdef>
- <xmlbean schema="${basedir}/schema/jndi-schema.xsd" destfile="${maven.build.dir}/${pom.artifactId}-${pom.currentVersion}.jar" srcgendir="${gen.src.dir}">
- <classpath>
- <path refid="maven.dependency.classpath" />
- </classpath>
- </xmlbean>
+ <taskdef name="schemaCompiler"
+ classname="org.apache.xmlbeans.impl.tool.XMLBean"
+ classpathref="maven.dependency.classpath" />
+
+ <j:set var="gen.src.dir" value="${maven.src.dir}/java"/>
+ <echo>Writing generated XMLBeans source files to: ${gen.src.dir}</echo>
+ <delete dir="${gen.src.dir}"/>
+ <mkdir dir="${gen.src.dir}"/>
+
+ <j:set var="gen.classes.dir" value="${maven.build.dest}"/>
+ <echo>Writing generated XMLBeans classes to: ${gen.classes.dir}</echo>
+ <delete dir="${gen.classes.dir}"/>
+ <mkdir dir="${gen.classes.dir}"/>
+
+ <schemaCompiler
+ classpathref="maven.dependency.classpath"
+ srcgendir="${gen.src.dir}"
+ classgendir="${gen.classes.dir}"
+ download="on"
+ verbose="on"
+ quiet="off"
+ optimize="off"
+ debug="on"
+ debugLevel="lines,vars,source"
+ fork="off"
+ ignoreDuplicatesInNamespaces=""
+ includeAntRuntime="on"
+ includeJavaRuntime="off"
+ memoryInitialSize="64M"
+ memoryMaximumSize="256M"
+ failonerror="on"
+ schema="src/schema/jndi-schema.xsd" />
+
</goal>
- <goal name="jars" prereqs="java:compile">
- <jar jarfile="${maven.build.dir}/${pom.artifactId}-src-${pom.currentVersion}.jar" basedir="${gen.src.dir}" />
- </goal>
+ <goal name="src-jar">
+ <jar jarfile="${maven.build.dir}/${pom.artifactId}-src-${pom.currentVersion}.jar"
+ basedir="${gen.src.dir}" />
+ </goal>
</project>
Modified: incubator/apollo/trunk/jndi-config/project.xml
Url: http://svn.apache.org/viewcvs/incubator/apollo/trunk/jndi-config/project.xml?view=diff&rev=109894&p1=incubator/apollo/trunk/jndi-config/project.xml&r1=109893&p2=incubator/apollo/trunk/jndi-config/project.xml&r2=109894
==============================================================================
--- incubator/apollo/trunk/jndi-config/project.xml (original)
+++ incubator/apollo/trunk/jndi-config/project.xml Sun Dec 5 10:03:32 2004
@@ -9,13 +9,13 @@
xsi:noNamespaceSchemaLocation="http://maven.apache.org/xsd/maven-project-3.0.0.xsd">
<pomVersion>3</pomVersion>
- <name>JNDI-Config XmlBean Generation</name>
- <id>jndi-config</id>
+ <name>Apollo JNDI-Config XmlBean Generation</name>
+ <id>apollo-jndi-config</id>
<groupId>apollo</groupId>
<currentVersion>SNAPSHOT</currentVersion>
<organization>
<name>Apache Software Foundation</name>
- <url>http://apache.org/</url>
+ <url>http://www.apache.org/</url>
</organization>
<repository>
@@ -48,6 +48,7 @@
</developers>
<dependencies>
+
<dependency>
<groupId>xmlbeans</groupId>
<artifactId>xbean</artifactId>
@@ -59,16 +60,6 @@
</properties>
</dependency>
- <dependency>
- <groupId>xmlbeans</groupId>
- <artifactId>xbean_xpath</artifactId>
- <version>1.0.3</version>
- <url>http://xml.apache.org/xmlbeans/</url>
- <properties>
- <war.bundle>true</war.bundle>
- <usage>Needed for XmlBeans.</usage>
- </properties>
- </dependency>
</dependencies>
<build>
Added: incubator/apollo/trunk/jndi-config/src/schema/jndi-schema.xsd
Url: http://svn.apache.org/viewcvs/incubator/apollo/trunk/jndi-config/src/schema/jndi-schema.xsd?view=auto&rev=109894
==============================================================================
--- (empty file)
+++ incubator/apollo/trunk/jndi-config/src/schema/jndi-schema.xsd Sun Dec 5 10:03:32 2004
@@ -0,0 +1,75 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified" attributeFormDefault="unqualified" targetNamespace="http://www.apache.org/wsfx/wsrf/jndi/config" xmlns:tns="http://www.apache.org/wsfx/wsrf/jndi/config">
+ <xs:element name="global">
+ <xs:complexType>
+ <xs:sequence>
+ <xs:element ref="tns:resource" minOccurs="0" maxOccurs="unbounded"/>
+ <xs:element ref="tns:resourceLink" minOccurs="0" maxOccurs="unbounded"/>
+ <xs:element ref="tns:environment" minOccurs="0" maxOccurs="unbounded"/>
+ <xs:element ref="tns:service" minOccurs="0" maxOccurs="unbounded"/>
+ </xs:sequence>
+ </xs:complexType>
+ </xs:element>
+ <xs:element name="jndiConfig">
+ <xs:complexType>
+ <xs:sequence>
+ <xs:element ref="tns:global" maxOccurs="1" minOccurs="0"/>
+ <xs:element ref="tns:service" maxOccurs="unbounded" minOccurs="0"/>
+ </xs:sequence>
+ </xs:complexType>
+ </xs:element>
+ <xs:element name="name" type="xs:string"/>
+ <xs:element name="parameter">
+ <xs:complexType>
+ <xs:sequence>
+ <xs:element ref="tns:name" maxOccurs="1" minOccurs="1" />
+ <xs:element ref="tns:value" maxOccurs="1" minOccurs="1"/>
+ </xs:sequence>
+ </xs:complexType>
+ </xs:element>
+ <xs:element name="resource">
+ <xs:complexType>
+ <xs:sequence>
+ <xs:element ref="tns:resourceParams"/>
+ </xs:sequence>
+ <xs:attribute name="name" type="xs:string" use="required"/>
+ <xs:attribute name="type" type="xs:string" use="required"/>
+ <xs:attribute name="scope" type="xs:string" />
+ <xs:attribute name="auth" type="xs:string" />
+ <xs:attribute name="description" type="xs:string" />
+ </xs:complexType>
+ </xs:element>
+ <xs:element name="resourceLink">
+ <xs:complexType>
+ <xs:attribute name="name" type="xs:string" use="required"/>
+ <xs:attribute name="target" type="xs:string" use="required"/>
+ </xs:complexType>
+ </xs:element>
+ <xs:element name="resourceParams">
+ <xs:complexType>
+ <xs:sequence>
+ <xs:element ref="tns:parameter" maxOccurs="unbounded"/>
+ </xs:sequence>
+ </xs:complexType>
+ </xs:element>
+ <xs:element name="service">
+ <xs:complexType>
+ <xs:sequence>
+ <xs:element ref="tns:resourceLink" minOccurs="0" maxOccurs="unbounded"/>
+ <xs:element ref="tns:resource" minOccurs="0" maxOccurs="unbounded"/>
+ <xs:element ref="tns:environment" minOccurs="0" maxOccurs="unbounded"/>
+ </xs:sequence>
+ <xs:attribute name="name" type="xs:string" use="required"/>
+ </xs:complexType>
+ </xs:element>
+ <xs:element name="value" type="xs:string"/>
+ <xs:element name="environment">
+ <xs:complexType>
+ <xs:attribute name="name" type="xs:string" use="required"/>
+ <xs:attribute name="type" type="xs:string" use="required"/>
+ <xs:attribute name="value" type="xs:string" use="required"/>
+ <xs:attribute name="description" type="xs:string"/>
+ </xs:complexType>
+ </xs:element>
+
+</xs:schema>
Modified: incubator/apollo/trunk/project.xml
Url: http://svn.apache.org/viewcvs/incubator/apollo/trunk/project.xml?view=diff&rev=109894&p1=incubator/apollo/trunk/project.xml&r1=109893&p2=incubator/apollo/trunk/project.xml&r2=109894
==============================================================================
--- incubator/apollo/trunk/project.xml (original)
+++ incubator/apollo/trunk/project.xml Sun Dec 5 10:03:32 2004
@@ -100,12 +100,12 @@
<dependency>
<groupId>apollo</groupId>
- <artifactId>jndi-config</artifactId>
+ <artifactId>apollo-jndi-config</artifactId>
<version>SNAPSHOT</version>
- <url>http://www.hp.com/</url>
+ <url>http://incubator.apache.org/apollo/</url>
<properties>
<war.bundle>true</war.bundle>
- <usage>Needed for handling our JNDI Xml config file via XmlBeans. This "could" be removed, but then we'd probably replace it with commons-config. The reason we avoided that approach is that we leveredge XmlBeans extensively in our codebase.</usage>
+ <usage>Needed for handling our JNDI XML config file via XmlBeans. This "could" be removed, but then we'd probably replace it with commons-config. The reason we avoided that approach is that we leveredge XmlBeans extensively in our codebase.</usage>
</properties>
</dependency>
@@ -116,7 +116,7 @@
<url>http://ws.apache.org/axis/</url>
<properties>
<war.bundle>true</war.bundle>
- <usage>Needed for compiling Axis-specific impls in our codebase. It is also needed for unit tests, etc.</usage>
+ <usage>Needed for compiling Axis-specific impls in our codebase. It is also needed for unit tests, etc.</usage>
</properties>
</dependency>
@@ -127,7 +127,7 @@
<url>http://ws.apache.org/axis/</url>
<properties>
<war.bundle>true</war.bundle>
- <usage>Needed for building our Jax-RPC compliant Handler impl.</usage>
+ <usage>Needed for building our JAX-RPC compliant Handler impl.</usage>
</properties>
</dependency>
---------------------------------------------------------------------
To unsubscribe, e-mail: apollo-dev-unsubscribe@ws.apache.org
For additional commands, e-mail: apollo-dev-help@ws.apache.org