You are viewing a plain text version of this content. The canonical link for it is here.
Posted to jaxme-dev@ws.apache.org by ma...@apache.org on 2005/08/22 14:16:22 UTC

svn commit: r234473 - in /webservices/jaxme/branches/MAVEN: ./ common-build/ projects/pm/ projects/pm/xdocs/

Author: mac
Date: Mon Aug 22 05:16:14 2005
New Revision: 234473

URL: http://svn.apache.org/viewcvs?rev=234473&view=rev
Log:
Mavenized PM

Added:
    webservices/jaxme/branches/MAVEN/projects/pm/maven.xml
Removed:
    webservices/jaxme/branches/MAVEN/projects/pm/build.xml
Modified:
    webservices/jaxme/branches/MAVEN/common-build/maven.xml
    webservices/jaxme/branches/MAVEN/common-build/project.properties
    webservices/jaxme/branches/MAVEN/project.properties
    webservices/jaxme/branches/MAVEN/projects/pm/project.xml
    webservices/jaxme/branches/MAVEN/projects/pm/xdocs/index.xml
    webservices/jaxme/branches/MAVEN/projects/pm/xdocs/ino.xml
    webservices/jaxme/branches/MAVEN/projects/pm/xdocs/jdbc.xml

Modified: webservices/jaxme/branches/MAVEN/common-build/maven.xml
URL: http://svn.apache.org/viewcvs/webservices/jaxme/branches/MAVEN/common-build/maven.xml?rev=234473&r1=234472&r2=234473&view=diff
==============================================================================
--- webservices/jaxme/branches/MAVEN/common-build/maven.xml (original)
+++ webservices/jaxme/branches/MAVEN/common-build/maven.xml Mon Aug 22 05:16:14 2005
@@ -27,7 +27,7 @@
 	<attainGoal name="fo:fo"/>	
 	<attainGoal name="pdf:pdf"/>
 -->	
-
+	<attainGoal name="jar:install"/>
 	<attainGoal name="site"/>
 </goal>
 

Modified: webservices/jaxme/branches/MAVEN/common-build/project.properties
URL: http://svn.apache.org/viewcvs/webservices/jaxme/branches/MAVEN/common-build/project.properties?rev=234473&r1=234472&r2=234473&view=diff
==============================================================================
--- webservices/jaxme/branches/MAVEN/common-build/project.properties (original)
+++ webservices/jaxme/branches/MAVEN/common-build/project.properties Mon Aug 22 05:16:14 2005
@@ -24,6 +24,7 @@
 maven.changelog.factory = org.apache.maven.svnlib.SvnChangeLogFactory
 maven.multiproject.type=jar
 # We are targetting the 1.3 JVM and above
+maven.compile.target=1.3
 maven.compile.source=1.3
 maven.compile.optimize=off
 maven.compile.debug=on

Modified: webservices/jaxme/branches/MAVEN/project.properties
URL: http://svn.apache.org/viewcvs/webservices/jaxme/branches/MAVEN/project.properties?rev=234473&r1=234472&r2=234473&view=diff
==============================================================================
--- webservices/jaxme/branches/MAVEN/project.properties (original)
+++ webservices/jaxme/branches/MAVEN/project.properties Mon Aug 22 05:16:14 2005
@@ -16,8 +16,8 @@
 
 maven.xdoc.date=left
 
-maven.subprojects.pom=projects/api/project.xml,projects/xs/project.xml,projects/js/project.xml,projects/jm/project.xml
-maven.multiproject.includes=projects/api/project.xml,projects/xs/project.xml,projects/js/project.xml,projects/jm/project.xml
+maven.subprojects.pom=projects/api/project.xml,projects/xs/project.xml,projects/js/project.xml,projects/jm/project.xml,projects/pm/project.xml
+maven.multiproject.includes=projects/api/project.xml,projects/xs/project.xml,projects/js/project.xml,projects/jm/project.xml,projects/pm/project.xml
 maven.multiproject.aggregateDir=projects/
 maven.multiproject.navigation=aggregate
 maven.multiproject.site.goals=clean,jar:install,site

Added: webservices/jaxme/branches/MAVEN/projects/pm/maven.xml
URL: http://svn.apache.org/viewcvs/webservices/jaxme/branches/MAVEN/projects/pm/maven.xml?rev=234473&view=auto
==============================================================================
--- webservices/jaxme/branches/MAVEN/projects/pm/maven.xml (added)
+++ webservices/jaxme/branches/MAVEN/projects/pm/maven.xml Mon Aug 22 05:16:14 2005
@@ -0,0 +1,59 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+	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 xmlns:ant="jelly:ant" xmlns:maven="jelly:maven">
+
+
+<postGoal name="test:test-resources">
+    <ant:property name="build.pm.db" location="${maven.test.dest}/db"/>
+    <ant:property name="jdbc.pm.driver" value="org.hsqldb.jdbcDriver"/>
+    <ant:property name="jdbc.pm.url" value="jdbc:hsqldb:${build.pm.db}/db"/>
+    <ant:property name="jdbc.pm.user" value="sa"/>
+    <ant:property name="jdbc.pm.password" value=""/>
+            
+	<ant:path id="pm.class.path">
+	  <ant:pathelement path="${maven.build.dest}"/>
+	  <ant:path refid="maven.dependency.classpath"/>
+	</ant:path>
+
+    <ant:delete dir="${build.pm.db}"/>
+    <ant:mkdir dir="${build.pm.db}"/>
+
+    <sql classpathref="pm.class.path" driver="${jdbc.pm.driver}"
+	        password="${jdbc.pm.password}" src="${maven.test.dest}/initdb.sql"
+	       url="${jdbc.pm.url}" userid="${jdbc.pm.user}"/>	
+	<ant:taskdef name="xjc" classname="org.apache.ws.jaxme.generator.XJCTask" classpathref="pm.class.path"/>
+	<ant:xjc target="${maven.test.dest}">
+            <ant:schema dir="${maven.test.dest}" includes="*.xsd"/>
+            <ant:sgFactoryChain className="org.apache.ws.jaxme.pm.generator.jdbc.JaxMeJdbcSG"/>
+            <ant:schemaReader className="org.apache.ws.jaxme.generator.sg.impl.JaxMeSchemaReader"/>
+            <ant:produces dir="${maven.test.dest}" includes="org/apache/ws/jaxme/test/pm/session/*"/>
+            <ant:property name="jdbc.driver" value="${jdbc.pm.driver}"/>
+            <ant:property name="jdbc.url" value="${jdbc.pm.url}"/>
+            <ant:property name="jdbc.user" value="${jdbc.pm.user}"/>
+            <ant:property name="jdbc.password" value="${jdbc.pm.password}"/>
+    </ant:xjc>
+    
+	<ant:path id="generated.test.src"
+              location="${maven.test.dest}"/>
+
+    <maven:addPath id="maven.test.compile.src.set"
+                   refid="generated.test.src"/>
+                       
+</postGoal>
+</project>

Modified: webservices/jaxme/branches/MAVEN/projects/pm/project.xml
URL: http://svn.apache.org/viewcvs/webservices/jaxme/branches/MAVEN/projects/pm/project.xml?rev=234473&r1=234472&r2=234473&view=diff
==============================================================================
--- webservices/jaxme/branches/MAVEN/projects/pm/project.xml (original)
+++ webservices/jaxme/branches/MAVEN/projects/pm/project.xml Mon Aug 22 05:16:14 2005
@@ -17,9 +17,11 @@
 	
 -->
 <project>
+    <pomVersion>3</pomVersion>
     <id>jaxme:jaxmepm</id>
     <artifactId>jaxmepm</artifactId>
     <name>JaxMePM</name>
+    <groupId>jaxme</groupId>
     <package>org.apache.ws.jaxme.pm</package>
     <description>JaxMe Persistence Management means the ability to read JaxMe objects from, insert them into, update them in, or delete them from the database. These operations are supported by JaxMe's persistence managers.&#xD;
 &#xD;
@@ -29,6 +31,25 @@
     * Native XML databases via XML:DB, a database independent API, much like JDBC; native XML databases include , , or . The most important difference between native XML and relational databases is, that the formers have no limitations on the structure of XML documents being stored. As a consequence, there is no need for specific support in the schema and XmlDbPM, the persistence manager for XML:DB, is generic.&#xD;
     * Native XML databases via proprietary API's or protocols; currently this only includes Tamino via the InoManager.</description>
     <url>http://ws.apache.org/jaxme/pm/</url>
+    <build>
+        <unitTest>
+            <resources>
+                <resource>
+                    <directory>src/test/resources/</directory>
+                    <targetPath>./</targetPath>
+                    <filtering>false</filtering>
+                </resource>
+            </resources>
+        </unitTest>
+        <sourceModifications>
+            <sourceModification>
+                <className>com.softwareag.tamino.db.api.objectModel.sax.TSAXDocument</className>
+                <excludes>
+                    <exclude>org/apache/ws/jaxme/**/api4j/*.*</exclude>
+                </excludes>
+            </sourceModification>
+        </sourceModifications>
+    </build>
     <extend>../../common-build/project.xml</extend>
     <dependencies>
         <dependency>
@@ -36,6 +57,52 @@
             <artifactId>xmldb-api</artifactId>
             <version>20021118</version>
             <type>jar</type>
+        </dependency>
+        <dependency>
+            <groupId>jaxme</groupId>
+            <artifactId>jaxmeapi</artifactId>
+            <version>${pom.currentVersion}</version>
+            <type>jar</type>
+            <url>http://ws.apache.org/jaxme/api/</url>
+        </dependency>
+        <dependency>
+            <groupId>jaxme</groupId>
+            <artifactId>jaxmexs</artifactId>
+            <version>${pom.currentVersion}</version>
+            <type>jar</type>
+            <url>http://ws.apache.org/jaxme/xs/</url>
+        </dependency>
+        <dependency>
+            <groupId>jaxme</groupId>
+            <artifactId>jaxme2</artifactId>
+            <version>${pom.currentVersion}</version>
+            <type>jar</type>
+            <url>http://ws.apache.org/jaxme/jm/</url>
+        </dependency>
+        <dependency>
+            <groupId>jaxme</groupId>
+            <artifactId>jaxmejs</artifactId>
+            <version>${pom.currentVersion}</version>
+            <type>jar</type>
+            <url>http://ws.apache.org/jaxme/js/</url>
+        </dependency>
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+            <version>3.8.1</version>
+            <type>jar</type>
+            <url>http://www.junit.org</url>
+        </dependency>
+        <dependency>
+            <groupId>hsqldb</groupId>
+            <artifactId>hsqldb</artifactId>
+            <version>1.7.1</version>
+            <type>jar</type>
+        </dependency>
+        <dependency>
+            <groupId>commons-jelly</groupId>
+            <artifactId>commons-jelly-tags-fmt</artifactId>
+            <version>1.0</version>
         </dependency>
     </dependencies>
     <shortDescription>The JaxMe Persistence Management</shortDescription>

Modified: webservices/jaxme/branches/MAVEN/projects/pm/xdocs/index.xml
URL: http://svn.apache.org/viewcvs/webservices/jaxme/branches/MAVEN/projects/pm/xdocs/index.xml?rev=234473&r1=234472&r2=234473&view=diff
==============================================================================
--- webservices/jaxme/branches/MAVEN/projects/pm/xdocs/index.xml (original)
+++ webservices/jaxme/branches/MAVEN/projects/pm/xdocs/index.xml Mon Aug 22 05:16:14 2005
@@ -16,11 +16,10 @@
  limitations under the License.
 
 -->
-<!DOCTYPE document PUBLIC "-//APACHE//DTD Documentation V1.2//EN" "document-v12.dtd">
 <document>
-  <header><title>The JaxMe Persistence Management</title></header>
+  <properties><title>The JaxMe Persistence Management</title></properties>
   <body>
-    <section><title>The JaxMe Persistence Management</title>
+    <section name="The JaxMe Persistence Management">
       <p>JaxMe Persistence Management means the ability to read JaxMe objects from,
         insert them into, update them in, or delete them from the database.
         These operations are supported by JaxMe's

Modified: webservices/jaxme/branches/MAVEN/projects/pm/xdocs/ino.xml
URL: http://svn.apache.org/viewcvs/webservices/jaxme/branches/MAVEN/projects/pm/xdocs/ino.xml?rev=234473&r1=234472&r2=234473&view=diff
==============================================================================
--- webservices/jaxme/branches/MAVEN/projects/pm/xdocs/ino.xml (original)
+++ webservices/jaxme/branches/MAVEN/projects/pm/xdocs/ino.xml Mon Aug 22 05:16:14 2005
@@ -16,10 +16,10 @@
  limitations under the License.
 
 -->
-<!DOCTYPE document PUBLIC "-//APACHE//DTD Documentation V1.2//EN" "document-v12.dtd">
 <document>
-  <header><title>Accessing a Tamino database</title></header>
+  <properties><title>Accessing a Tamino database</title></properties>
   <body>
+  <section name="Accessing a Tamino database">  
   	<p><link href="ext:tamino">Tamino</link> is a native XML database by
       <link href="ext:sag">Software AG</link>. Compared to a relational
   	  database, it has the disadvantage of being not very popular.
@@ -44,8 +44,8 @@
   	  	allows to embed Tamino into the transactional context of
   	  	an EJB container.</li>
   	</ul>
-
-	<section><title>Preparations</title>
+	</section>
+	<section name="Preparations">
 		<p>Tamino is accessible via two different query languages.
 		  The elder variant is called <em>X-Query</em> and is best
 		  compared with <em>XPath</em>. The newer language is based
@@ -75,7 +75,7 @@
 		</ol>
 	</section>
 
-	<section><title>Preparing the Tamino Resource Adapter</title>
+	<section name="Preparing the Tamino Resource Adapter">
 		<p>Adding the Tamino Resource Adapter is covered in the
 		  documentation of the TaminoAPI4J. However, we'll provide
 		  specific details for JBoss 3.2 here, because the docs
@@ -171,7 +171,7 @@
 		</ul>
 	</section>
 
-	<section><title>An example schema for TaminoAPI4J</title>
+	<section name="An example schema for TaminoAPI4J">
 	  <p>As an example, we'll reuse the schema from the marshaller
 		examples, <code>Address.xsd</code>:</p>
 	  <source><![CDATA[
@@ -247,7 +247,7 @@
 	    </ul>
 	</section>
 
-	<section><title>Build your own JaxMe distribution</title>
+	<section name="Build your own JaxMe distribution">
 		<p>For licensing reasons, we cannot add the files
 		  <code>TaminoAPI4J.jar</code> and
 		  <code>TaminoJCA.jar</code> to the JaxMe SVN repository.
@@ -275,7 +275,7 @@
 		</note>
 	</section>
 
-	<section><title>Creating an Ant task</title>
+	<section name="Creating an Ant task">
 		<p>To invoke the JaxMe generator, use an Ant task like
 		  the following:</p>
 		<source><![CDATA[
@@ -297,7 +297,7 @@
 ]]>   	</source>
 	</section>
 
-	<section><title>Using the native HTTP API</title>
+	<section name="Using the native HTTP API">
 		<p>Not yet documented. (To be done.)</p>
 	</section>
   </body>

Modified: webservices/jaxme/branches/MAVEN/projects/pm/xdocs/jdbc.xml
URL: http://svn.apache.org/viewcvs/webservices/jaxme/branches/MAVEN/projects/pm/xdocs/jdbc.xml?rev=234473&r1=234472&r2=234473&view=diff
==============================================================================
--- webservices/jaxme/branches/MAVEN/projects/pm/xdocs/jdbc.xml (original)
+++ webservices/jaxme/branches/MAVEN/projects/pm/xdocs/jdbc.xml Mon Aug 22 05:16:14 2005
@@ -16,10 +16,10 @@
  limitations under the License.
 
 -->
-<!DOCTYPE document PUBLIC "-//APACHE//DTD Documentation V1.2//EN" "document-v12.dtd">
 <document>
-  <header><title>Accessing databases via JDBC</title></header>
+  <properties><title>Accessing databases via JDBC</title></properties>
   <body>
+  <section name="Accessing databases via JDBC">
     <p>Using a relational database via JDBC has a major disadvantage:
       For obvious reasons, you are limited to a flat XML structure.
       In other words, you may choose an XML element, and map its
@@ -30,7 +30,8 @@
       generated persistence managers (PM's). To overcome this problem,
       you might like to use manually written subclasses of the
       generated PM's.</p>
-    <section><title>Creating a schema</title>
+    </section>
+    <section name="Creating a schema">
       <p>The first step when working with JDBC is to read the database
         schema. The database details must be specified in the schema.
         As an example, we quote the file session.xsd from the
@@ -95,7 +96,7 @@
       </note>
     </section>
 
-	<section><title>Running the JDBC generator</title>
+	<section name="Running the JDBC generator">
 	  <p>As usual, the schema reader must be used to read your schema
 	    and create sources. However, in this case the invocation looks
 	    slightly different:</p>
@@ -174,7 +175,7 @@
       </note>
 	</section>
 
-	<section><title>Inserting objects into the database</title>
+	<section name="Inserting objects into the database">
 	  <p>To insert an object into the database, you might like to
 	    use the following code:</p>
 	  <source><![CDATA[
@@ -224,7 +225,7 @@
       </note>
 	</section>
 
-	<section><title>Reading objects from the database</title>
+	<section name="Reading objects from the database">
 	  <p>Reading objects from the database is also straightforward.
 	    Assume for now, that we want to fetch the HTTP session with
 	    Cookie "56ghs2398723sjkjl". Here's how we do that:</p>
@@ -249,7 +250,7 @@
 ]]>   </source>
 	</section>
 
-	<section><title>Deleting objects from the database</title>
+	<section name="Deleting objects from the database">
 	  <p>Deleting an object requires the objects primary key.
 	    Assuming that the cookie attribute is an HTTP sessions
 	    primary key, one might do the following:</p>
@@ -269,7 +270,7 @@
 ]]>   </source>
 	</section>
 
-    <section><title>Updating objects in the database</title>
+    <section name="Updating objects in the database">
       <p>Updating an object works much like deleting it.
         In particular it requires the presence of a primary
         key. In other words, the following example would



---------------------------------------------------------------------
To unsubscribe, e-mail: jaxme-dev-unsubscribe@ws.apache.org
For additional commands, e-mail: jaxme-dev-help@ws.apache.org