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 ta...@apache.org on 2005/11/15 00:50:48 UTC
svn commit: r344273 - in /portals/jetspeed-2/trunk: ./ applications/demo/
applications/demo/src/webapp/WEB-INF/ commons/ maven-plugin/
Author: taylor
Date: Mon Nov 14 15:50:43 2005
New Revision: 344273
URL: http://svn.apache.org/viewcvs?rev=344273&view=rev
Log:
1. http://issues.apache.org/jira/browse/JS2-408
Make Derby the default database deployed with Jetspeed-2 replacing Hypersonic
2. deprecate SNAPSHOT
version is now = 2.0-dev
Snapshots were giving users endless headaches with the build
It seems that if you have a good infrastructure they work
But for people coming straight off the internet there are problems
Modified:
portals/jetspeed-2/trunk/applications/demo/project.xml
portals/jetspeed-2/trunk/applications/demo/src/webapp/WEB-INF/portlet.xml
portals/jetspeed-2/trunk/commons/project.xml
portals/jetspeed-2/trunk/core-build.xml
portals/jetspeed-2/trunk/maven-plugin/plugin.jelly
portals/jetspeed-2/trunk/maven-plugin/plugin.properties
portals/jetspeed-2/trunk/maven-plugin/project.xml
portals/jetspeed-2/trunk/project.properties
Modified: portals/jetspeed-2/trunk/applications/demo/project.xml
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/applications/demo/project.xml?rev=344273&r1=344272&r2=344273&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/applications/demo/project.xml (original)
+++ portals/jetspeed-2/trunk/applications/demo/project.xml Mon Nov 14 15:50:43 2005
@@ -249,12 +249,12 @@
</properties>
</dependency>
<dependency>
- <groupId>hsqldb</groupId>
- <artifactId>hsqldb</artifactId>
- <version>${hsql.version}</version>
+ <groupId>org.apache.derby</groupId>
+ <artifactId>derby</artifactId>
+ <version>${derby.version}</version>
<type>jar</type>
<properties>
- <war.bundle>true</war.bundle>
+ <war.bundle>false</war.bundle>
</properties>
</dependency>
</dependencies>
Modified: portals/jetspeed-2/trunk/applications/demo/src/webapp/WEB-INF/portlet.xml
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/applications/demo/src/webapp/WEB-INF/portlet.xml?rev=344273&r1=344272&r2=344273&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/applications/demo/src/webapp/WEB-INF/portlet.xml (original)
+++ portals/jetspeed-2/trunk/applications/demo/src/webapp/WEB-INF/portlet.xml Mon Nov 14 15:50:43 2005
@@ -655,15 +655,15 @@
</preference>
<preference>
<name>JdbcDriver</name>
- <value>org.hsqldb.jdbcDriver</value>
+ <value>org.apache.derby.jdbc.EmbeddedDriver</value>
</preference>
<preference>
<name>JdbcConnection</name>
- <value>jdbc:hsqldb:hsql://127.0.0.1:9001</value>
+ <value>jdbc:derby:/tmp/productiondb</value>
</preference>
<preference>
<name>JdbcUsername</name>
- <value>sa</value>
+ <value></value>
</preference>
<preference>
<name>JdbcPassword</name>
@@ -671,11 +671,11 @@
</preference>
<preference>
<name>SSOJdbcDriver</name>
- <value>org.hsqldb.jdbcDriver</value>
+ <value>org.apache.derby.jdbc.EmbeddedDriver</value>
</preference>
<preference>
- <name>SSOJdbcConnection</name>
- <value>jdbc:hsqldb:hsql://127.0.0.1:9001</value>
+ <name>SSOJdbcConnection</name>
+ <value>jdbc:derby:/tmp/productiondb</value>
</preference>
<preference>
<name>SSOSite</name>
Modified: portals/jetspeed-2/trunk/commons/project.xml
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/commons/project.xml?rev=344273&r1=344272&r2=344273&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/commons/project.xml (original)
+++ portals/jetspeed-2/trunk/commons/project.xml Mon Nov 14 15:50:43 2005
@@ -43,7 +43,14 @@
<war.bundle>true</war.bundle>
</properties>
</dependency>
-
+ <dependency>
+ <groupId>org.apache.derby</groupId>
+ <artifactId>derby</artifactId>
+ <version>10.1.1.0</version>
+ <properties>
+ <war.bundle>false</war.bundle>
+ </properties>
+ </dependency>
<dependency>
<groupId>portals-bridges</groupId>
<artifactId>portals-bridges-common</artifactId>
Modified: portals/jetspeed-2/trunk/core-build.xml
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/core-build.xml?rev=344273&r1=344272&r2=344273&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/core-build.xml (original)
+++ portals/jetspeed-2/trunk/core-build.xml Mon Nov 14 15:50:43 2005
@@ -305,12 +305,13 @@
<!-- Not required if using other database -->
<dependency>
- <id>hsqldb</id>
- <version>${hsql.version}</version>
- <properties>
- <war.bundle>${hsql.include}</war.bundle>
- </properties>
- </dependency>
+ <groupId>org.apache.derby</groupId>
+ <artifactId>derby</artifactId>
+ <version>${derby.version}</version>
+ <properties>
+ <war.bundle>false</war.bundle>
+ </properties>
+ </dependency>
<!-- Not required if using other LDAP -->
<dependency>
<groupId>directory</groupId>
@@ -318,4 +319,4 @@
<version>0.9.3</version>
</dependency>
</dependencies>
-</project>
\ No newline at end of file
+</project>
Modified: portals/jetspeed-2/trunk/maven-plugin/plugin.jelly
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/maven-plugin/plugin.jelly?rev=344273&r1=344272&r2=344273&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/maven-plugin/plugin.jelly (original)
+++ portals/jetspeed-2/trunk/maven-plugin/plugin.jelly Mon Nov 14 15:50:43 2005
@@ -99,7 +99,7 @@
<filter token="{commons.logging.include" value="${commons.logging.include}"/>
<filter token="{log4j.include" value="${log4j.include}"/>
<filter token="{jta.include" value="${jta.include}"/>
- <filter token="{hsql.include" value="${hsql.include}"/>
+ <filter token="{derby.include" value="${derby.include}"/>
</filterset>
<!-- Note: keep already existing project-info.xml allowing custom modifications -->
@@ -478,6 +478,8 @@
todir="${org.apache.jetspeed.server.shared}"/>
<copy file="${maven.repo.local}/portals-bridges/jars/portals-bridges-common-${portals.bridges.common.version}.jar"
todir="${org.apache.jetspeed.server.shared}"/>
+ <copy file="${maven.repo.local}/org.apache.derby/jars/derby-${derby.version}.jar"
+ todir="${org.apache.jetspeed.server.shared}"/>
</goal>
<goal name="j2:catalina.shared" description="Copy all jars necessary for common container">
@@ -735,6 +737,10 @@
<j:set var="org.apache.jetspeed.target.rdbms.name" value="sapdb"/>
<j:set var="org.apache.jetspeed.target.rdbms.dropdrops" value="true"/>
</j:when>
+ <j:when test="${dbase == 'derby'}">
+ <j:set var="org.apache.jetspeed.target.rdbms.name" value="derby"/>
+ <j:set var="org.apache.jetspeed.target.rdbms.dropdrops" value="true"/>
+ </j:when>
<j:otherwise>
<fail message="unsupported target database: ${org.apache.jetspeed.target.rdbms}"/>
</j:otherwise>
@@ -771,7 +777,7 @@
<goal name="j2:_copy.rdbms.sql.scripts" >
<util:file var="targetRdbmsScriptsDir" name="${portal.sql.src.dir}/${org.apache.jetspeed.target.rdbms}" />
<j:if test="${targetRdbmsScriptsDir.exists()}">
- <!-- Copy specific DB scripts possibly also overriding the Torque-generated ones -->
+ <!-- Copy specific DB scripts possibly also overriding the Torque-generated ones -->
<copy todir="${portal.sql.target.dir}/${org.apache.jetspeed.target.rdbms}"
overwrite="true"
verbose="true"
@@ -858,13 +864,28 @@
increases by at least 30 seconds for each level of inheritance.
Note: the project generated with genapp has an inheritance level of 4!
Hopefully, these kind of problems are solved when we move to maven 2 ...
- -->
+ -->
+
+ <j:set var="webinflocation" value="${org.apache.jetspeed.portal.home}/${org.apache.jetspeed.portal.target.dir}" />
<j:set var="parentScope" scope="parent" value=""/>
- <sql driver="${org.apache.jetspeed.database.driver}" url="${org.apache.jetspeed.database.url}"
+ <j:set var="tempvarA" value="${org.apache.jetspeed.database.driver}" />
+<!--
+ leave this section out for now. Ultimately we'd like to find a way to install the derby DB somewhere path relative
+ at run time, but for now leave it with /tmp it works on both platforms, but doesn't confuse things with
+ build/install orders. Specifically the DB during j2:quickStart, after the WAR files are created, so the DB is not
+ copied into WEB-INF, unless things are run twice without a clean.
+
+
+ <j:if test="${tempvarA == 'org.apache.derby.jdbc.EmbeddedDriver'}">
+ <j:set var="org.apache.jetspeed.database.url" value="jdbc:derby:${webinflocation}/WEB-INF/productiondb;create=true" />
+ </j:if>
+-->
+ <sql driver="${org.apache.jetspeed.database.driver}" url="${org.apache.jetspeed.database.url}"
userid="${org.apache.jetspeed.database.user}" password="${org.apache.jetspeed.database.password}"
src="${database.arg.script}"
onerror="${database.arg.onerror}">
<classpath>
+ <pathelement path="${plugin.getDependencyPath('org.apache.derby:derby')}"/>
<pathelement path="${org.apache.jetspeed.jdbc.drivers.path}"/>
<pathelement path="${plugin.getDependencyPath('hsqldb')}"/>
</classpath>
Modified: portals/jetspeed-2/trunk/maven-plugin/plugin.properties
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/maven-plugin/plugin.properties?rev=344273&r1=344272&r2=344273&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/maven-plugin/plugin.properties (original)
+++ portals/jetspeed-2/trunk/maven-plugin/plugin.properties Mon Nov 14 15:50:43 2005
@@ -44,7 +44,7 @@
# 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
+derby.include=true
# ---------------------------------------------------------------------------
# Plugin Settings
@@ -72,24 +72,3 @@
torque.idTableXMLFile =
torque.template.sql = sql/base/Control.vm
-# ---------------------------------------------------------------------------
-# Database Properties
-# ---------------------------------------------------------------------------
-
-# 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
-org.apache.jetspeed.production.database.password =
-
-org.apache.jetspeed.production.jdbc.drivers.path=
-org.apache.jetspeed.production.database.default.name=hsql
-
-# 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.test.jdbc.drivers.path=
-org.apache.jetspeed.test.database.default.name=hsql
Modified: portals/jetspeed-2/trunk/maven-plugin/project.xml
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/maven-plugin/project.xml?rev=344273&r1=344272&r2=344273&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/maven-plugin/project.xml (original)
+++ portals/jetspeed-2/trunk/maven-plugin/project.xml Mon Nov 14 15:50:43 2005
@@ -39,14 +39,6 @@
<type>plugin</type>
</dependency>
<dependency>
- <groupId>hsqldb</groupId>
- <artifactId>hsqldb</artifactId>
- <version>1.8.0.2</version>
- <properties>
- <war.bundle>true</war.bundle>
- </properties>
- </dependency>
- <dependency>
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
<version>1.0.3</version>
@@ -57,6 +49,23 @@
<artifactId>apacheds-main</artifactId>
<version>0.9.3</version>
</dependency>
+ <dependency>
+ <groupId>hsqldb</groupId>
+ <artifactId>hsqldb</artifactId>
+ <version>1.8.0.2</version>
+ <properties>
+ <war.bundle>true</war.bundle>
+ </properties>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.derby</groupId>
+ <artifactId>derby</artifactId>
+ <version>10.1.1.0</version>
+ <properties>
+ <war.bundle>false</war.bundle>
+ </properties>
+ </dependency>
+
</dependencies>
<build>
<sourceDirectory>src/java</sourceDirectory>
Modified: portals/jetspeed-2/trunk/project.properties
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/project.properties?rev=344273&r1=344272&r2=344273&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/project.properties (original)
+++ portals/jetspeed-2/trunk/project.properties Mon Nov 14 15:50:43 2005
@@ -14,20 +14,21 @@
# jetspeed.version is required is {user.home}/build.properties.
# Other properties.
-jetspeed.version=2.0-M4-SNAPSHOT
+jetspeed.version=2.0-dev
pluto.version=1.0.1
portlet.api.version=1.0
servlet.api.version=2.3
myfaces.version=1.1.0
spring.version=1.1.5
-portals.bridges.common.version=0.4-SNAPSHOT
-portals.bridges.frameworks.version=0.4-SNAPSHOT
-portals.bridges.jsf.version=0.4-SNAPSHOT
-portals.bridges.perl.version=0.4-SNAPSHOT
-portals.bridges.php.version=0.4-SNAPSHOT
-portals.bridges.struts.version=1.2.7-0.4-SNAPSHOT
-portals.bridges.velocity.version=0.4-SNAPSHOT
+portals.bridges.common.version=0.4-dev
+portals.bridges.frameworks.version=0.4-dev
+portals.bridges.jsf.version=0.4-dev
+portals.bridges.perl.version=0.4-dev
+portals.bridges.php.version=0.4-dev
+portals.bridges.struts.version=1.2.7-0.4-dev
+portals.bridges.velocity.version=0.4-dev
commons.logging.version=1.0.3
+derby.version=10.1.1.0
hsql.version=1.8.0.2
# Whether or not to include commons-logging in war files. Your container may already have this.
@@ -44,8 +45,8 @@
# 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
+# You only need Derby if you don't supply your own database
+derby.include=true
maven.mode.online = true
maven.repo.remote = http://www.bluesunrise.com/maven/, http://www.ibiblio.org/maven/, http://dist.codehaus.org/, http://cvs.apache.org/repository
@@ -114,26 +115,26 @@
# Database Properties
# ---------------------------------------------------------------------------
+org.apache.jetspeed.derbydatabase.path = /tmp
+
# Default 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
+org.apache.jetspeed.production.database.url = jdbc:derby:${org.apache.jetspeed.derbydatabase.path}/productiondb;create=true
+org.apache.jetspeed.production.database.driver = org.apache.derby.jdbc.EmbeddedDriver
+org.apache.jetspeed.production.database.user =
org.apache.jetspeed.production.database.password =
org.apache.jetspeed.production.jdbc.drivers.path=
-org.apache.jetspeed.production.database.default.name=hsql
+org.apache.jetspeed.production.database.default.name=derby
-# 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 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.url = jdbc:derby:${org.apache.jetspeed.derbydatabase.path}/testdb;create=true
+org.apache.jetspeed.test.database.driver = org.apache.derby.jdbc.EmbeddedDriver
+org.apache.jetspeed.test.database.user =
org.apache.jetspeed.test.database.password =
org.apache.jetspeed.test.jdbc.drivers.path=
-org.apache.jetspeed.test.database.default.name=hsql
+org.apache.jetspeed.test.database.default.name=derby
# 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}
@@ -141,4 +142,5 @@
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
\ No newline at end of file
+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