You are viewing a plain text version of this content. The canonical link for it is here.
Posted to jetspeed-dev@portals.apache.org by dl...@apache.org on 2004/04/29 04:54:14 UTC
cvs commit: jakarta-jetspeed-2/struts-portlet/demo project.xml project.properties maven.xml
dlestrat 2004/04/28 19:54:14
Modified: struts-portlet/demo project.xml project.properties maven.xml
Log:
Applying patch from Ate Douma regarding JS2-18: Cannot run J2 using
Oracle due to problems with OBJ, Torque and dependencies on HSQLDB.
Revision Changes Path
1.2 +1 -17 jakarta-jetspeed-2/struts-portlet/demo/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/jakarta-jetspeed-2/struts-portlet/demo/project.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- project.xml 20 Apr 2004 02:06:02 -0000 1.1
+++ project.xml 29 Apr 2004 02:54:14 -0000 1.2
@@ -49,22 +49,6 @@
<war.bundle>false</war.bundle>
</properties>
</dependency>
- <dependency>
- <id>jetspeed-commons</id>
- <groupId>jetspeed2</groupId>
- <version>2.0-a1-dev</version>
- <properties>
- <war.bundle>false</war.bundle>
- </properties>
- </dependency>
- <!-- for default deployment in Jetspeed 2 -->
- <dependency>
- <id>hsqldb</id>
- <version>1.7.1</version>
- <properties>
- <war.bundle>false</war.bundle>
- </properties>
- </dependency>
<!-- for unit tests -->
<dependency>
<groupId>junit</groupId>
@@ -163,7 +147,7 @@
<properties>
<war.bundle>true</war.bundle>
</properties>
- </dependency>
+ </dependency>
</dependencies>
<build>
1.2 +0 -7 jakarta-jetspeed-2/struts-portlet/demo/project.properties
Index: project.properties
===================================================================
RCS file: /home/cvs/jakarta-jetspeed-2/struts-portlet/demo/project.properties,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- project.properties 20 Apr 2004 02:06:02 -0000 1.1
+++ project.properties 29 Apr 2004 02:54:14 -0000 1.2
@@ -33,13 +33,6 @@
portlet.war.name = struts-demo
webapp.dir=${basedir}/src/webapp
-org.apache.jetspeed.database.url = jdbc:hsqldb:hsql://127.0.0.1:9001
-org.apache.jetspeed.database.driver = org.hsqldb.jdbcDriver
-org.apache.jetspeed.database.user = sa
-org.apache.jetspeed.database.password =
-
-database.default.name=hsql
-
maven.war.src=${basedir}/src/webapp
maven.war.src.excludes=META-INF/**,WEB-INF/classes/**
# war plugin doesn't set this variable ???
1.2 +1 -90 jakarta-jetspeed-2/struts-portlet/demo/maven.xml
Index: maven.xml
===================================================================
RCS file: /home/cvs/jakarta-jetspeed-2/struts-portlet/demo/maven.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- maven.xml 20 Apr 2004 02:06:02 -0000 1.1
+++ maven.xml 29 Apr 2004 02:54:14 -0000 1.2
@@ -16,6 +16,7 @@
<project default="war:war"
xmlns:j="jelly:core"
xmlns:define="jelly:define"
+ xmlns:maven="jelly:maven"
xmlns:reactor="reactor">
<postGoal name="war:webapp">
@@ -23,95 +24,5 @@
<fileset dir="${basedir}/src/java" excludes="**/*.java"/>
</copy>
</postGoal>
-
- <goal name="deploy">
- <java classname="org.apache.jetspeed.tools.pamanager.PortletApplicationManager" fork="yes">
- <classpath>
- <path refid="maven.dependency.classpath"/>
- <pathelement path="${maven.build.dest}"/>
- <pathelement location="${jetspeed.webapp}/WEB-INF/classes"/>
- <fileset dir="${jetspeed.webapp}/WEB-INF/lib"/>
- <fileset dir="${catalina.shared.lib}"/>
- </classpath>
- <sysproperty key="org.apache.jetspeed.database.url" value="${org.apache.jetspeed.database.url}"/>
- <sysproperty key="org.apache.jetspeed.database.driver" value="${org.apache.jetspeed.database.driver}"/>
- <sysproperty key="org.apache.jetspeed.database.user" value="${org.apache.jetspeed.database.user}"/>
- <sysproperty key="org.apache.jetspeed.database.password" value="${org.apache.jetspeed.database.password}"/>
- <arg value="-action" />
- <arg value="deploy" />
- <arg value="-PortletAppName" />
- <arg value="${portlet.app.name}" />
- <arg value="-warfilename" />
- <arg value="target/${portlet.war.name}.war" />
- <arg value="-webappDir" />
- <arg value="${deploy.war.dir}/" />
- <arg value="-PortalName" />
- <arg value="jetspeed" />
- <arg value="-ApplicationType" />
- <arg value="webapp" />
- </java>
- </goal>
-
- <goal name="undeploy">
- <java classname="org.apache.jetspeed.tools.pamanager.PortletApplicationManager" fork="yes">
- <classpath>
- <path refid="maven.dependency.classpath"/>
- <pathelement path="${maven.build.dest}"/>
- <pathelement location="${jetspeed.webapp}/WEB-INF/classes"/>
- <fileset dir="${jetspeed.webapp}/WEB-INF/lib"/>
- <fileset dir="${catalina.shared.lib}"/>
- </classpath>
- <sysproperty key="org.apache.jetspeed.database.url" value="${org.apache.jetspeed.database.url}"/>
- <sysproperty key="org.apache.jetspeed.database.driver" value="${org.apache.jetspeed.database.driver}"/>
- <sysproperty key="org.apache.jetspeed.database.user" value="${org.apache.jetspeed.database.user}"/>
- <sysproperty key="org.apache.jetspeed.database.password" value="${org.apache.jetspeed.database.password}"/>
- <arg value="-action" />
- <arg value="undeploy" />
- <arg value="-PortletAppName" />
- <arg value="${portlet.app.name}" />
- <arg value="-webappDir" />
- <arg value="${deploy.war.dir}" />
- <arg value="-PortalName" />
- <arg value="jetspeed" />
- <arg value="-ApplicationType" />
- <arg value="webapp" />
- </java>
- </goal>
-
- <preGoal name="deploy">
- <attainGoal name= "java:compile"/>
- <attainGoal name= "war:war"/>
- </preGoal>
-
- <postGoal name="undeploy">
- <attainGoal name="db.remove"/>
- </postGoal>
-
- <postGoal name="deploy">
- <attainGoal name="db.create"/>
- </postGoal>
-
- <!-- ================================================================ -->
- <!-- EXECUTE a DB SCRIPT -->
- <!-- ================================================================ -->
- <goal name="db.execute">
- <sql driver="${org.apache.jetspeed.database.driver}"
- classpathref="maven.dependency.classpath"
- url="${org.apache.jetspeed.database.url}"
- userid="${org.apache.jetspeed.database.user}"
- password="${org.apache.jetspeed.database.password}"
- src="${database.arg.script}">
- </sql>
- </goal>
-
- <goal name="db.create">
- <j:set var="database.arg.script" value="sql/create-entities.sql" />
- <attainGoal name="db.execute" />
- </goal>
- <goal name="db.remove">
- <j:set var="database.arg.script" value="sql/remove-entities.sql" />
- <attainGoal name="db.execute" />
- </goal>
-
</project>
---------------------------------------------------------------------
To unsubscribe, e-mail: jetspeed-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: jetspeed-dev-help@jakarta.apache.org