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 2005/11/06 04:45:31 UTC
svn commit: r331076 - in /portals/jetspeed-2/trunk: .classpath
core-build.xml maven.xml project.properties
Author: dlestrat
Date: Sat Nov 5 19:45:28 2005
New Revision: 331076
URL: http://svn.apache.org/viewcvs?rev=331076&view=rev
Log:
http://issues.apache.org/jira/browse/JS2-188#action_12356329
Revisited the LDAP implementation. Integrate Apache DS with J2.
All unit tests for LDAP are passing on Apache DS. Leave them excluded for now.
Various quick fixes for serializable objects. Add serialUID.
Documentation to come in the next few days.
Modified:
portals/jetspeed-2/trunk/.classpath
portals/jetspeed-2/trunk/core-build.xml
portals/jetspeed-2/trunk/maven.xml
portals/jetspeed-2/trunk/project.properties
Modified: portals/jetspeed-2/trunk/.classpath
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/.classpath?rev=331076&r1=331075&r2=331076&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/.classpath (original)
+++ portals/jetspeed-2/trunk/.classpath Sat Nov 5 19:45:28 2005
@@ -1,10 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
<classpathentry excluding="**/.svn/*" kind="src" path="portlet-api/src/java"/>
- <classpathentry kind="src" path="components/statistics/src/java"/>
- <classpathentry kind="src" path="components/statistics/src/test"/>
+ <classpathentry kind="src" path="etc/log4j"/>
<classpathentry excluding="**/.svn/*" kind="src" path="jetspeed-api/src/java"/>
<classpathentry excluding="**/.svn/*" kind="src" path="commons/src/java"/>
+ <classpathentry excluding="**/.svn/*" kind="src" path="commons/src/test"/>
<classpathentry excluding="**/.svn/*" kind="src" path="components/capability/src/java"/>
<classpathentry excluding="**/.svn/*" kind="src" path="components/capability/src/test"/>
<classpathentry excluding="**/.svn/*" kind="src" path="components/cm/src/java"/>
@@ -41,6 +41,8 @@
<classpathentry excluding="**/.svn/*|Log4j.properties" kind="src" path="components/security/src/test"/>
<classpathentry excluding="**/.svn/*|META-INF/transaction.xml" kind="src" path="components/sso/src/java"/>
<classpathentry excluding="**/.svn/*" kind="src" path="components/sso/src/test"/>
+ <classpathentry kind="src" path="components/statistics/src/java"/>
+ <classpathentry kind="src" path="components/statistics/src/test"/>
<classpathentry excluding="**/.svn/*" kind="src" path="components/web-content/src/java"/>
<classpathentry excluding="**/.svn/*|log4j.properties" kind="src" path="components/web-content/src/test"/>
<classpathentry excluding="**/.svn/*" kind="src" path="maven-plugin/src/java"/>
Modified: portals/jetspeed-2/trunk/core-build.xml
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/core-build.xml?rev=331076&r1=331075&r2=331076&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/core-build.xml (original)
+++ portals/jetspeed-2/trunk/core-build.xml Sat Nov 5 19:45:28 2005
@@ -310,6 +310,12 @@
<properties>
<war.bundle>${hsql.include}</war.bundle>
</properties>
+ </dependency>
+ <!-- Not required if using other LDAP -->
+ <dependency>
+ <groupId>directory</groupId>
+ <artifactId>apacheds-main</artifactId>
+ <version>0.9.3</version>
</dependency>
</dependencies>
</project>
Modified: portals/jetspeed-2/trunk/maven.xml
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/maven.xml?rev=331076&r1=331075&r2=331076&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/maven.xml (original)
+++ portals/jetspeed-2/trunk/maven.xml Sat Nov 5 19:45:28 2005
@@ -162,6 +162,12 @@
excludes="applications/project.xml" goals="war:install" banner="Build and Install all Jetspeed 2 wars"
postProcessing="false" ignoreFailures="false" />
</goal>
+
+ <goal name="jetspeed2:schema">
+ <maven:reactor basedir="${basedir}"
+ includes="components/security-schema/project.xml" goals="directory:schema" banner="Generate Jetspeed 2 schema"
+ postProcessing="false" ignoreFailures="false" />
+ </goal>
<goal name="initMavenPlugin">
<!-- build jetspeed 2 plugin core -->
@@ -172,28 +178,30 @@
<goal name="allBuild" description="Build all jars and war">
<attainGoal name="j2:portal.conf.sql"/>
+ <attainGoal name="j2:portal.conf.ldap"/>
<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>
-
- <!-- Build jars files-->
- <attainGoal name="jetspeed2:jar:install" />
+ <j:if test="${context.getVariable('maven.test.skip') != 'true'}">
+ <attainGoal name="j2:db.create.test" />
+ </j:if>
+
+ <attainGoal name="jetspeed2:schema" />
+
+ <!-- Build jars files-->
+ <attainGoal name="jetspeed2:jar:install" />
<!-- disabling testing as we're past that -->
<j:set var="maven.test.skip" value="true"/>
<!-- Build and install pa war files -->
- <attainGoal name="jetspeed2:war:install" />
+ <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"
banner="Build and deploy the Jetspeed 2 Maven plugin" postProcessing="false" ignoreFailures="false" />
Modified: portals/jetspeed-2/trunk/project.properties
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/project.properties?rev=331076&r1=331075&r2=331076&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/project.properties (original)
+++ portals/jetspeed-2/trunk/project.properties Sat Nov 5 19:45:28 2005
@@ -55,6 +55,9 @@
# Display the maven version the web site is documenting
maven.xdoc.version = ${pom.currentVersion}
+# Maven Compilation Setting
+maven.compile.source=1.4
+maven.compile.target=1.4
maven.compile.deprecation=on
# Whether to skip tests.
@@ -137,4 +140,4 @@
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
+org.apache.jetspeed.use.test.database = true
\ No newline at end of file
---------------------------------------------------------------------
To unsubscribe, e-mail: jetspeed-dev-unsubscribe@portals.apache.org
For additional commands, e-mail: jetspeed-dev-help@portals.apache.org