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 at...@apache.org on 2005/08/04 23:05:51 UTC
svn commit: r227487 [3/3] - in /portals/jetspeed-2/branches/JS2-319: ./
maven-plugin/ maven-plugin/src/plugin-resources/
Modified: portals/jetspeed-2/branches/JS2-319/maven-plugin/plugin.properties
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/branches/JS2-319/maven-plugin/plugin.properties?rev=227487&r1=227486&r2=227487&view=diff
==============================================================================
--- portals/jetspeed-2/branches/JS2-319/maven-plugin/plugin.properties (original)
+++ portals/jetspeed-2/branches/JS2-319/maven-plugin/plugin.properties Thu Aug 4 14:05:37 2005
@@ -1,21 +1,25 @@
# ---------------------------------------------------------------------------
-# Defaults for user settings
-#
-# The settings below can be overriden in your ${USER_HOME}/build.properties.
-# ---------------------------------------------------------------------------
-org.apache.jetspeed.portal.name=jetspeed
-
-# ---------------------------------------------------------------------------
-# General Settings
+# plugin portal and portal.genapp configuration properties
# ---------------------------------------------------------------------------
-# Jetspeed groupId that will be used to build.
-jetspeed.groupId=@JETSPEED_GROUPID@
+# the following set is required and has no default
+org.apache.jetspeed.portal.home=
+org.apache.jetspeed.portal.groupId=
+org.apache.jetspeed.portal.artifactId=
+org.apache.jetspeed.portal.name=
+org.apache.jetspeed.portal.currentVersion=
+
+org.apache.jetspeed.portal.conf.dir=target/portal-conf
+org.apache.jetspeed.portal.sql.dir=target/portal-sql
+org.apache.jetspeed.portal.db.dir=target/portal-db
+org.apache.jetspeed.portal.webapp.dir=target/${org.apache.jetspeed.portal.artifactId}
+org.apache.jetspeed.portal.target.dir=target/${org.apache.jetspeed.portal.artifactId}
+# will test database sql be generated (and then only if different type from production database)
+org.apache.jetspeed.use.test.database = false
# ---------------------------------------------------------------------------
# Dependencies versions
# ---------------------------------------------------------------------------
-# Jetspeed version we will be using to build
jetspeed.version=@JETSPEED_VERSION@
pluto.version=@PLUTO_VERSION@
portlet.api.version=@PORTLET_API_VERSION@
@@ -32,6 +36,15 @@
commons.logging.version=@COMMONS_LOGGING_VERSION@
log4j.version=@LOG4J_VERSION@
+# Whether or not to include log4j in war files
+commons.logging.include=true
+# Whether or not to include log4j in war files. Your container may already have this.
+log4j.include=true
+# Whether or not to include JTP api in war files. Your container may already have this.
+jta.include=true
+# You only need HSQL if you do not supply your own database
+hsql.include=true
+
# ---------------------------------------------------------------------------
# Plugin Settings
# ---------------------------------------------------------------------------
@@ -41,7 +54,7 @@
# Deployment Properties
# ---------------------------------------------------------------------------
# The portal directory in its deployed target.
-org.apache.jetspeed.portal.dir=${org.apache.jetspeed.deploy.war.dir}/${org.apache.jetspeed.portal.name}
+org.apache.jetspeed.portal.dir=${org.apache.jetspeed.deploy.war.dir}/${org.apache.jetspeed.portal.artifactId}
# Default server name and port for autodeployment.
# You can override these via ${user.home}/build.properties.
@@ -62,7 +75,7 @@
# Database Properties
# ---------------------------------------------------------------------------
-# Default production server settings.
+# Default hsql production server settings.
org.apache.jetspeed.production.database.url = jdbc:hsqldb:hsql://127.0.0.1:9001
org.apache.jetspeed.production.database.driver = org.hsqldb.jdbcDriver
org.apache.jetspeed.production.database.user = sa
@@ -71,18 +84,15 @@
org.apache.jetspeed.production.jdbc.drivers.path=
org.apache.jetspeed.production.database.default.name=hsql
-# Override this to put your database elsewhere than the plugin repo
-org.apache.jetspeed.plugin.hsql.db = ${org.apache.jetspeed.plugin.root}/plugin-resources/Production
-
-# Default database server settings.
-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 =
+# Default hsql test database server settings.
+org.apache.jetspeed.test.database.url = jdbc:hsqldb:hsql://127.0.0.1:9001
+org.apache.jetspeed.test.database.driver = org.hsqldb.jdbcDriver
+org.apache.jetspeed.test.database.user = sa
+org.apache.jetspeed.test.database.password =
-org.apache.jetspeed.jdbc.drivers.path=
-org.apache.jetspeed.database.default.name=hsql
+org.apache.jetspeed.test.jdbc.drivers.path=
+org.apache.jetspeed.test.database.default.name=hsql
# The database to use with OJB. Substitution value for repository_database.xml jdbc-connection-descriptor
# platform attribute.
-org.apache.jetspeed.production.database.ojb.platform=Hsqldb
\ No newline at end of file
+org.apache.jetspeed.production.database.ojb.platform=Hsqldb
Modified: portals/jetspeed-2/branches/JS2-319/maven-plugin/project.xml
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/branches/JS2-319/maven-plugin/project.xml?rev=227487&r1=227486&r2=227487&view=diff
==============================================================================
--- portals/jetspeed-2/branches/JS2-319/maven-plugin/project.xml (original)
+++ portals/jetspeed-2/branches/JS2-319/maven-plugin/project.xml Thu Aug 4 14:05:37 2005
@@ -17,7 +17,6 @@
$Id$
-->
<project>
- <id>jetspeed2:maven-jetspeed2-plugin</id>
<extend>${basedir}/../project-info.xml</extend>
<pomVersion>3</pomVersion>
<artifactId>maven-jetspeed2-plugin</artifactId>
@@ -33,13 +32,6 @@
</repository>
<dependencies>
<dependency>
- <groupId>torque</groupId>
- <artifactId>maven-torque-plugin</artifactId>
- <id>torque:maven-torque-plugin</id>
- <version>3.2-rc1</version>
- <type>plugin</type>
- </dependency>
- <dependency>
<groupId>hsqldb</groupId>
<artifactId>hsqldb</artifactId>
<version>1.7.1</version>
@@ -60,17 +52,12 @@
<resource>
<directory>${basedir}/src/plugin-resources</directory>
<targetPath>plugin-resources</targetPath>
- <filtering>false</filtering>
</resource>
<resource>
<directory>${basedir}</directory>
<includes>
<include>plugin.jelly</include>
- <include>plugin.properties</include>
- <include>project.properties</include>
- <include>project.xml</include>
</includes>
- <filtering>false</filtering>
</resource>
</resources>
</build>
Added: portals/jetspeed-2/branches/JS2-319/maven-plugin/src/plugin-resources/project-info.xml
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/branches/JS2-319/maven-plugin/src/plugin-resources/project-info.xml?rev=227487&view=auto
==============================================================================
--- portals/jetspeed-2/branches/JS2-319/maven-plugin/src/plugin-resources/project-info.xml (added)
+++ portals/jetspeed-2/branches/JS2-319/maven-plugin/src/plugin-resources/project-info.xml Thu Aug 4 14:05:37 2005
@@ -0,0 +1,32 @@
+<?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.
+
+ $Id$
+-->
+<project>
+ <organization/>
+ <inceptionYear/>
+ <package/>
+ <description/>
+ <shortDescription/>
+ <url/>
+ <issueTrackingUrl/>
+ <siteAddress/>
+ <siteDirectory/>
+ <repository/>
+ <mailingLists/>
+ <developers/>
+</project>
\ No newline at end of file
Propchange: portals/jetspeed-2/branches/JS2-319/maven-plugin/src/plugin-resources/project-info.xml
------------------------------------------------------------------------------
svn:eol-style = native
Added: portals/jetspeed-2/branches/JS2-319/maven-plugin/src/plugin-resources/project.xml
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/branches/JS2-319/maven-plugin/src/plugin-resources/project.xml?rev=227487&view=auto
==============================================================================
--- portals/jetspeed-2/branches/JS2-319/maven-plugin/src/plugin-resources/project.xml (added)
+++ portals/jetspeed-2/branches/JS2-319/maven-plugin/src/plugin-resources/project.xml Thu Aug 4 14:05:37 2005
@@ -0,0 +1,27 @@
+<?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.
+
+ $Id$
+-->
+<project>
+ <extend>full-portal.xml</extend>
+ <pomVersion>3</pomVersion>
+ <groupId>@PORTAL_GROUPID@</groupId>
+ <artifactId>@PORTAL_ARTIFACTID@</artifactId>
+ <name>@PORTAL_NAME@</name>
+ <currentVersion>@PORTAL_CURRENT_VERSION@</currentVersion>
+</project>
+
Propchange: portals/jetspeed-2/branches/JS2-319/maven-plugin/src/plugin-resources/project.xml
------------------------------------------------------------------------------
svn:eol-style = native
Modified: portals/jetspeed-2/branches/JS2-319/maven.xml
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/branches/JS2-319/maven.xml?rev=227487&r1=227486&r2=227487&view=diff
==============================================================================
--- portals/jetspeed-2/branches/JS2-319/maven.xml (original)
+++ portals/jetspeed-2/branches/JS2-319/maven.xml Thu Aug 4 14:05:37 2005
@@ -171,8 +171,12 @@
<goal name="allBuild" description="Build all jars and war">
- <attainGoal name="j2:check.required.properties" />
- <attainGoal name="j2:db.scripts.gen" />
+ <attainGoal name="j2:portal.conf.sql"/>
+ <attainGoal name="j2:portal.conf.ojb"/>
+
+ <attainGoal name="j2:portal.conf.jetspeed"/>
+ <attainGoal name="j2:portal.conf.tomcat"/>
+
<j:if test="${context.getVariable('maven.test.skip') != 'true'}">
<attainGoal name="j2:db.create.test" />
</j:if>
@@ -180,11 +184,15 @@
<!-- Build jars files-->
<attainGoal name="jetspeed2:jar:install" />
- <!-- Build war files -->
- <attainGoal name="jetspeed2:war:install" />
+ <!-- disabling testing as we're past that -->
+
+ <j:set var="maven.test.skip" value="true"/>
- <maven:reactor basedir="${basedir}/portal-webapp" includes="project.xml" goals="j2:portal.install"
- banner="Build and deploy the Jetspeed 2 Portal Engine" postProcessing="false" ignoreFailures="false" />
+ <!-- Build and install pa war files -->
+ <attainGoal name="jetspeed2:war:install" />
+
+ <!-- Build and install portal war file -->
+ <attainGoal name="war:install"/>
<!-- build jetspeed 2 plugin with webapp -->
<maven:reactor basedir="${basedir}/maven-plugin" includes="project.xml" goals="deploy-plugin"
Modified: portals/jetspeed-2/branches/JS2-319/project.properties
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/branches/JS2-319/project.properties?rev=227487&r1=227486&r2=227487&view=diff
==============================================================================
--- portals/jetspeed-2/branches/JS2-319/project.properties (original)
+++ portals/jetspeed-2/branches/JS2-319/project.properties Thu Aug 4 14:05:37 2005
@@ -130,3 +130,11 @@
# platform attribute.
org.apache.jetspeed.production.database.ojb.platform=Hsqldb
org.apache.jetspeed.test.database.ojb.platform=Hsqldb
+
+# plugin defaults overrides for building jetspeed portal just as with a generated custom portal setup
+org.apache.jetspeed.portal.home=${org.apache.jetspeed.project.home}
+org.apache.jetspeed.portal.groupId=jetspeed2
+org.apache.jetspeed.portal.artifactId=jetspeed
+org.apache.jetspeed.portal.name=Jetspeed 2 Enterprise Portal
+org.apache.jetspeed.portal.currentVersion=${jetspeed.version}
+org.apache.jetspeed.use.test.database = true
---------------------------------------------------------------------
To unsubscribe, e-mail: jetspeed-dev-unsubscribe@portals.apache.org
For additional commands, e-mail: jetspeed-dev-help@portals.apache.org