incubator-graffito-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From clomb...@apache.org
Subject svn commit: r365468 - in /incubator/graffito/trunk: commons/project.xml components/maven.xml components/project.xml
Date Mon, 02 Jan 2006 23:40:08 GMT
Author: clombart
Date: Mon Jan  2 15:40:02 2006
New Revision: 365468

URL: http://svn.apache.org/viewcvs?rev=365468&view=rev
Log:
Use the last j2 dependencies

Modified:
    incubator/graffito/trunk/commons/project.xml
    incubator/graffito/trunk/components/maven.xml
    incubator/graffito/trunk/components/project.xml

Modified: incubator/graffito/trunk/commons/project.xml
URL: http://svn.apache.org/viewcvs/incubator/graffito/trunk/commons/project.xml?rev=365468&r1=365467&r2=365468&view=diff
==============================================================================
--- incubator/graffito/trunk/commons/project.xml (original)
+++ incubator/graffito/trunk/commons/project.xml Mon Jan  2 15:40:02 2006
@@ -1,11 +1 @@
-<?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>
-<extend>${basedir}/../project.xml</extend>
  <pomVersion>3</pomVersion>
 <id>graffito-commons</id>
  <groupId>graffito</groupId>
  <name>Graffito
Commons</name>
  <currentVersion>1.0-a1-dev</currentVersion>
  <package>org.apache.portals.graffito</package>
 <description>
	  Tools, utility classes and exceptions used in the different Graffito
subproject
  </description>
  <shortDescription>Graffito Commons </shortDescription>

<repository>
-    <connection>scm:subversion:https://svn.apache.org/repos/asf/incubator/graffito/trunk/commons</connection>
-    <developerConnection>scm:subversion:https://svn.apache.org/repos/asf/incubator/graffito/trunk/commons</developerConnection>
-    <url>http://svn.apache.org/viewcvs</url>
-  </repository>
  
  <dependencies>
    <dependency>
      <id>graffito-api</id>
     <groupId>graffito</groupId>
      <version>1.0-a1-dev</version>
     <properties>
        <war.bundle>true</war.bundle>
      </properties>
   </dependency>    
  </dependencies>
  <build>
    <sourceDirectory>src/java</sourceDirectory>
    <resources>
      <resource>
        <directory>${basedir}/src/java</directory>
       <excludes>
          <exclude>**/*.java</exclude>
        </excludes>
     </resource>
    </resources>
    <unitTestSourceDirectory>src/test</unitTestSourceDirectory>
   <unitTest>
       <includes>
        <include>**/Test*.java</include>
     </includes>
      <excludes>
      </excludes>
      <resources>
       <resource>
          <directory>${basedir}/src/test</directory>
         <excludes>
          <exclude>**/*.java</exclude>
          </excludes>
       </resource>
      </resources>
    </unitTest>
    
  </build>
 <reports>
-       <report>maven-javadoc-plugin</report>
-  </reports>
-    
-</project>
+<?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>
<extend>${basedir}/../project.xml</extend>
 <pomVersion>3</pomVersion>
  <id>graffito-commons</id>
  <groupId>org.apache.portals.graffito</groupId>
 <name>Graffito Commons</name>
  <currentVersion>1.0-a1-dev</currentVersion>
 <package>org.apache.portals.graffito</package>
  <description>
	  Tools,
utility classes and exceptions used in the different Graffi
 to subproject
  </description>
  <shortDescription>Graffito Commons </shortDescription>

<repository>
   <connection>scm:subversion:https://svn.apache.org/repos/asf/incubator/graffito/trunk/commons</connection>
   <developerConnection>scm:subversion:https://svn.apache.org/repos/asf/incubator/graffito/trunk/commons</developerConnection>
   <url>http://svn.apache.org/viewcvs</url>
  </repository>
  
  <dependencies>
   <dependency>
      <id>graffito-api</id>
      <groupId>org.apache.portals.graffito</groupId>
     <version>1.0-a1-dev</version>
      <properties>
        <war.bundle>true</war.bundle>
     </properties>
    </dependency>    
  </dependencies>
  <build>
   <sourceDirectory>src/java</sourceDirectory>
     <resources>
      <resource>
       <directory>${basedir}/src/java</directory>
        <excludes>
  
       <exclude>**/*.java</exclude>
        </excludes>
      </resource>
   </resources>
    <unitTestSourceDirectory>src/test</unitTestSourceDirector
 y>
    <unitTest>
       <includes>
        <include>**/Test*.java</include>
     </includes>
      <excludes>
      </excludes>
      <resources>
       <resource>
          <directory>${basedir}/src/test</directory>
         <excludes>
          <exclude>**/*.java</exclude>
          </excludes>
       </resource>
      </resources>
    </unitTest>
    
  </build>
 <reports>
       <report>maven-javadoc-plugin</report>
  </reports>
   
</project>
\ No newline at end of file

Modified: incubator/graffito/trunk/components/maven.xml
URL: http://svn.apache.org/viewcvs/incubator/graffito/trunk/components/maven.xml?rev=365468&r1=365467&r2=365468&view=diff
==============================================================================
--- incubator/graffito/trunk/components/maven.xml (original)
+++ incubator/graffito/trunk/components/maven.xml Mon Jan  2 15:40:02 2006
@@ -14,21 +14,26 @@
   limitations under the License.
  -->
 <project default="java:jar" xmlns:j="jelly:core" xmlns:define="jelly:define" xmlns:maven="jelly:maven"
>
+	
+	<!-- Target of maven test:single test -->
+	<property name='testcase' value='org.apache.portals.graffito.persistence.impl.TestPersistenceService'
/>
 	<!-- ================================================================ -->
-	<!-- TEST                                                                           
             -->
+	<!-- TEST                                                             -->
 	<!-- ================================================================ -->
 	<preGoal name="test:test">
 		<attainGoal name="dbSetup"/>
 		<attainGoal name="db.reinit.test" />
 	</preGoal>
 	<goal name="dbSetup">
-		<j:set var="maven.junit.sysproperties" 
-			value="${maven.junit.sysproperties} org.apache.portals.graffito.database.url org.apache.portals.graffito.database.driver
org.apache.portals.graffito.database.user org.apache.portals.graffito.database.password" 
-			/>
 		<j:set var="org.apache.portals.graffito.database.url" value="${org.apache.portals.graffito.test.database.url}"/>
 		<j:set var="org.apache.portals.graffito.database.driver" value="${org.apache.portals.graffito.test.database.driver}"/>
 		<j:set var="org.apache.portals.graffito.database.user" value="${org.apache.portals.graffito.test.database.user}"/>
 		<j:set var="org.apache.portals.graffito.database.password" value="${org.apache.portals.graffito.test.database.password}"/>
+		
+		<j:set var="maven.junit.sysproperties" 
+		       value="${maven.junit.sysproperties} org.apache.portals.graffito.database.url org.apache.portals.graffito.database.driver
org.apache.portals.graffito.database.user org.apache.portals.graffito.database.password" />
+		
+		
 		<copy file="src/test/repository.xml" todir="${maven.test.dest}" overwrite="true" failonerror="false">
 			<filterset begintoken="@" endtoken="@">
 				<filter token="PLATFORM" value="${org.apache.portals.graffito.database.ojb.platform}"/>
@@ -37,21 +42,33 @@
 				<filter token="DATASOURCE" value="${org.apache.portals.graffito.database.ojb.datasource}"/>
 			</filterset>
 		</copy>
+
+		<echo message="driver path : ${org.apache.portals.graffito.test.jdbc.drivers.path}"/>
+		
 		<path id="jdbc.drivers.path" path="${org.apache.portals.graffito.test.jdbc.drivers.path}"/>
 		<maven:addPath id="maven.dependency.classpath" refid="jdbc.drivers.path"/>
+				
 	</goal>
 	<!-- ================================================================ -->
 	<!--  CREATE Graffito Server Master DB Script                                   -->
 	<!-- ================================================================ -->
-	<goal name="db.scripts.gen" prereqs="torque:init" description="Build SQL scripts using
Torque generator">
+	<goal name="db.scripts.gen" description="Build SQL scripts using Torque generator">
+		<attainGoal name="torque:init"/>
 		<echo message="Generating SQL schema creation scripts for MySQL"/>
-		<torque-sql basePathToDbProps="sql/base/" contextProperties="${torque.contextProperties}"

-			    controlTemplate="${torque.template.sql}" idTableXMLFile="${torque.idTableXMLFile}"

-			    outputDirectory="${maven.build.src}/sql/mysql" outputFile="report.${torque.project}.sql.generation"

-			    sqldbmap="${maven.build.src}/sql/mysql/sqldb.map" targetDatabase="mysql" useClasspath="true">
-			<fileset dir="${torque.schema.dir}" includes="${torque.schema.sql.includes}" excludes="${torque.schema.sql.excludes}"

-				 />
+		
+		<torque-sql basePathToDbProps="sql/base/"
+			    contextProperties="${torque.contextProperties}"
+			    controlTemplate="${torque.template.sql}"
+			    idTableXMLFile="${torque.idTableXMLFile}"
+			    outputDirectory="${maven.build.src}/sql/mysql"
+			    outputFile="report.${torque.project}.sql.generation"
+			    sqldbmap="${maven.build.src}/sql/mysql/sqldb.map"
+			    targetDatabase="mysql"
+			    useClasspath="true">
+			<fileset dir="${torque.schema.dir}" includes="${torque.schema.sql.includes}" excludes="${torque.schema.sql.excludes}"/>

 		</torque-sql>
+
+			
 		<echo message="Generating SQL schema creation scripts for HSQLDB"/>
 		<torque-sql basePathToDbProps="sql/base/" contextProperties="${torque.contextProperties}"

 			controlTemplate="${torque.template.sql}" idTableXMLFile="${torque.idTableXMLFile}" 
@@ -87,21 +104,31 @@
 				/>
 		</torque-sql>
 	</goal>
+	<goal name="copy.scripts.derby"  description="Copy the derby script into the target folder">
+		<echo message="Copying SQL schema creation scripts for Derby"/>
+		<copy todir="${maven.build.src}/sql/derby" overwrite="true">
+			<fileset dir="src/sql/GraffitoServer/derby" />
+		</copy>		
+		
+	</goal>
 	<!-- ================================================================ -->
 	<!-- SQL SCRIPT  EXEC TEMPLATE                                                    -->
 	<!-- TODO: I'd like to implement this as a plugin or use commons SQL     -->
 	<!-- Don't call this goal directly, call :                                          
      -->
-	<!--      db.create.test or db.create.production                                    
  -->
+	<!--      db.create.test or db.create.production onerror="${database.arg.onerror}"  
                                   -->
 	<!-- ================================================================ -->
 	<goal name="db.execute">
+		<echo message="Execute SQL script : ${database.arg.script} -- ON ERROR = ${database.arg.onerror}"/>
+		
 		<sql driver="${org.apache.portals.graffito.database.driver}" url="${org.apache.portals.graffito.database.url}"

 			userid="${org.apache.portals.graffito.database.user}" password="${org.apache.portals.graffito.database.password}"

-			src="${database.arg.script}">
+			src="${database.arg.script}" >
 			<classpath>
 				<path refid="maven.dependency.classpath"/>
 				<pathelement path="${org.apache.portals.graffito.jdbc.drivers.path}"/>
 			</classpath>
 		</sql>
+		
 	</goal>
 	<goal name="db.test.properties">
 		<echo 
@@ -115,10 +142,8 @@
 		<echo message="org.apache.portals.graffito.test.jetspeed : ${org.apache.portals.graffito.test.jetspeed}"/>
 		<j:set var="name" value="${org.apache.portals.graffito.test.database.default.name}X"/>
 		<j:set var="url" value="${org.apache.portals.graffito.test.database.url}X"/>
-		<j:set var="driver" value="${org.apache.portals.graffito.test.database.driver}X"/>
-		<j:set var="password" value="${org.apache.portals.graffito.test.database.password}X"/>
-		<j:set var="jarpath" value="${org.apache.portals.graffito.test.jdbc.drivers.path}X"/>
-		<j:set var="jetspeed" value="${org.apache.portals.graffito.test.jetspeed}X"/>
+		<j:set var="driver" value="${org.apache.portals.graffito.test.database.driver}X"/>
	
+		<j:set var="jetspeed" value="${org.apache.portals.graffito.test.jetspeed}X"/>		
 		<j:if test="${name == 'X'}">
 			<echo message="No value found for the build property org.apache.portals.graffito.test.database.default.name"/>
 			<j:set var="status" value="error"/>
@@ -131,13 +156,7 @@
 			<echo message="No value found for the build property org.apache.portals.graffito.test.database.driver"/>
 			<j:set var="status" value="error"/>
 		</j:if >
-		<j:if test="${password == 'X'}">
-			<echo message="No value found for the build property org.apache.portals.graffito.test.database.password"/>
-		</j:if >
-		<j:if test="${jarpath == 'X'}">
-			<echo message="No value found for the build property org.apache.portals.graffito.test.database.path"/>
-			<j:set var="status" value="error"/>
-		</j:if >
+		
 		<j:if test="${jetspeed == 'X'}">
 			<echo message="No value found for the build property org.apache.portals.graffito.test.jetspeed"/>
 			<j:set var="status" value="error"/>
@@ -153,6 +172,8 @@
 		<j:set var="org.apache.portals.graffito.database.user" value="${org.apache.portals.graffito.test.database.user}"/>
 		<j:set var="org.apache.portals.graffito.database.password" value="${org.apache.portals.graffito.test.database.password}"/>
 		<j:set var="org.apache.portals.graffito.jdbc.drivers.path" value="${org.apache.portals.graffito.test.jdbc.drivers.path}"/>
+		
+		
 	</goal>
 	<goal name="db.production.properties">
 		<echo 
@@ -211,16 +232,17 @@
 			value="${org.apache.portals.graffito.production.database.password}"/>
 		<j:set var="org.apache.portals.graffito.jdbc.drivers.path" 
 			value="${org.apache.portals.graffito.production.jdbc.drivers.path}"/>
+		
 	</goal>
 	<!-- ================================================================ -->
 	<!-- EXECUTE CREATE DB SQL SCRIPTS                                            -->
 	<!-- TODO: I'd like to implement this as a plugin or use commons SQL     -->
 	<!-- ================================================================ -->
-	<goal name="db.create.test">
+	<goal name="db.create.test">		
 		<attainGoal name="db.test.properties"/>
 		<attainGoal name="db.create"/>
 	</goal>
-	<goal name="db.create.production">
+	<goal name="db.create.production">		
 		<attainGoal name="db.production.properties"/>
 		<attainGoal name="db.create"/>
 		<j:set var="database.arg.script" 
@@ -229,6 +251,7 @@
 		
 	</goal>
 	<goal name="db.create">
+		<j:set var="database.arg.onerror" value="abort"/>
 		<j:if test="${jetspeed == 'falseX'}">
 			<j:set var="database.arg.script" 
 				value="./target/src/sql/${org.apache.portals.graffito.database.default.name}/security-schema.sql"
/>
@@ -260,33 +283,21 @@
 		
 	</goal>
 	<goal name="db.drop">
+		<j:set var="database.arg.onerror" value="continue"/>
 		<j:set var="database.arg.script" 
-			value="./src/sql/GraffitoServer/${org.apache.portals.graffito.database.default.name}/drop-db.sql"
/>
+		       value="./src/sql/GraffitoServer/${org.apache.portals.graffito.database.default.name}/drop-db.sql"
/>
 		<attainGoal name="db.execute" />
 		<j:if test="${jetspeed == 'falseX'}">
 			<j:set var="database.arg.script" 
-				value="./src/sql/GraffitoServer/${org.apache.portals.graffito.database.default.name}/drop-security.sql"
/>
+			       value="./src/sql/GraffitoServer/${org.apache.portals.graffito.database.default.name}/drop-security.sql"
/>
 			<attainGoal name="db.execute" />
 			<j:set var="database.arg.script" 
-				value="./src/sql/GraffitoServer/${org.apache.portals.graffito.database.default.name}/drop-ojb.sql"
/>
+			       value="./src/sql/GraffitoServer/${org.apache.portals.graffito.database.default.name}/drop-ojb.sql"
/>
 			<attainGoal name="db.execute" />
 		</j:if>
-	</goal>
-	<!-- ================================================================ -->
-	<!-- EXECUTE DELETE DB SQL SCRIPTS                                            -->
-	<!-- TODO: I'd like to implement this as a plugin or use commons SQL     -->
-	<!-- ================================================================ -->
-	<goal name="db.delete.test">
-		<attainGoal name="db.test.properties"/>
-		<attainGoal name="db.delete"/>
-	</goal>
-	<goal name="db.delete.production">
-		<attainGoal name="db.production.properties"/>
-		<attainGoal name="db.delete"/>
-	</goal>
-	<goal name="db.delete">
-		<j:set var="database.arg.script" value="./src/sql/GraffitoServer/delete-db.sql" />
-		<attainGoal name="db.execute" />
+			
+
+		
 	</goal>
 	<!-- ================================================================ -->
 	<!-- EXECUTE DROP & CREATE DB SQL SCRIPTS                                 -->
@@ -294,12 +305,14 @@
 	<!-- ================================================================ -->
 	<goal name="db.reinit.test">
 		<attainGoal name="db.scripts.gen"/>
-		<attainGoal name="db.drop.test"/>
+		<attainGoal name="copy.scripts.derby"/>		
+                <attainGoal name="db.drop.test"/>		
 		<attainGoal name="db.create.test"/>
 	</goal>
 	
 	<goal name="db.reinit.production">
 		<attainGoal name="db.scripts.gen"/>
+		<attainGoal name="copy.scripts.derby"/>
 		<attainGoal name="db.drop.production"/>
 		<attainGoal name="db.create.production"/>
 	</goal>

Modified: incubator/graffito/trunk/components/project.xml
URL: http://svn.apache.org/viewcvs/incubator/graffito/trunk/components/project.xml?rev=365468&r1=365467&r2=365468&view=diff
==============================================================================
--- incubator/graffito/trunk/components/project.xml (original)
+++ incubator/graffito/trunk/components/project.xml Mon Jan  2 15:40:02 2006
@@ -21,7 +21,7 @@
   <extend>${basedir}/../project.xml</extend>
   <pomVersion>3</pomVersion>
   <id>graffito-components</id>
-  <groupId>graffito</groupId>
+  <groupId>org.apache.portals.graffito</groupId>
   <name>Graffito Components</name>
   <currentVersion>1.0-a1-dev</currentVersion>
   <package>org.apache.portals.graffito</package>
@@ -38,46 +38,51 @@
 
   
   <dependencies>  
-    
+    <dependency>
+	    <groupId>org.apache.derby</groupId>
+	    <artifactId>derby</artifactId>
+	    <version>10.1.1.0</version>
+    </dependency> 
+        
     <dependency>  
       <id>graffito-commons</id>
-      <groupId>graffito</groupId>
+      <groupId>org.apache.portals.graffito</groupId>
       <version>1.0-a1-dev</version>
     </dependency>
 		
     <dependency>  
       <id>graffito-api</id>
-      <groupId>graffito</groupId>
+      <groupId>org.apache.portals.graffito</groupId>
       <version>1.0-a1-dev</version>
     </dependency>
     
     <dependency>
       <id>jetspeed-api</id>
-      <groupId>jetspeed2</groupId>
+      <groupId>org.apache.portals.jetspeed-2</groupId>
       <version>&jetspeed-version;</version>
     </dependency>
 
     <dependency>
       <id>jetspeed-security</id>
-      <groupId>jetspeed2</groupId>
+      <groupId>org.apache.portals.jetspeed-2</groupId>
       <version>&jetspeed-version;</version>
     </dependency>    
      
      <dependency>
       <id>jetspeed-cm</id>
-      <groupId>jetspeed2</groupId>
+      <groupId>org.apache.portals.jetspeed-2</groupId>
       <version>&jetspeed-version;</version>
     </dependency>
        
     <dependency>
       <id>jetspeed-rdbms</id>
-      <groupId>jetspeed2</groupId>
+      <groupId>org.apache.portals.jetspeed-2</groupId>
       <version>&jetspeed-version;</version>
     </dependency>
 
     <dependency>
       <id>jetspeed-commons</id>
-      <groupId>jetspeed2</groupId>
+      <groupId>org.apache.portals.jetspeed-2</groupId>
       <version>&jetspeed-version;</version>
     </dependency>    
     
@@ -93,7 +98,7 @@
     
     <dependency>
       <id>ojb:db-ojb</id>
-      <version>1.0.2</version>
+      <version>1.0.3</version>
     </dependency>
     
     <dependency>
@@ -178,7 +183,7 @@
                  
     <dependency>
       <id>springframework:spring</id>
-      <version>1.1.5</version>
+      <version>1.2.4</version>
     </dependency>
 
    <dependency>
@@ -195,7 +200,15 @@
       <id>oro</id>
       <version>2.0.7</version>
     </dependency>    
-       
+     
+    
+    <dependency>
+	<groupId>torque</groupId>
+	<artifactId>maven-torque-plugin</artifactId>
+	<version>3.2</version>
+	<type>plugin</type>
+	<properties/>
+    </dependency>	
   </dependencies>  
   
   



Mime
View raw message