portals-jetspeed-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dlest...@apache.org
Subject svn commit: r331075 - in /portals/jetspeed-2/trunk/maven-plugin: maven.xml plugin.jelly plugin.properties project.xml
Date Sun, 06 Nov 2005 03:44:46 GMT
Author: dlestrat
Date: Sat Nov  5 19:44:43 2005
New Revision: 331075

URL: http://svn.apache.org/viewcvs?rev=331075&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/maven-plugin/maven.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

Modified: portals/jetspeed-2/trunk/maven-plugin/maven.xml
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/maven-plugin/maven.xml?rev=331075&r1=331074&r2=331075&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/maven-plugin/maven.xml (original)
+++ portals/jetspeed-2/trunk/maven-plugin/maven.xml Sat Nov  5 19:44:43 2005
@@ -34,6 +34,9 @@
     <copy todir="${basedir}/target/classes/plugin-resources/sql" overwrite="true" failonerror="true">
       <fileset dir="${basedir}/../etc/sql"/>
     </copy>
+    <copy todir="${basedir}/target/classes/plugin-resources/apacheds" overwrite="true"
failonerror="true">
+      <fileset dir="${basedir}/../etc/apacheds"/>
+    </copy>
     <copy todir="${basedir}/target/classes/plugin-resources/webapp" overwrite="true" failonerror="true">
       <fileset dir="${basedir}/../src/webapp"/>
     </copy>

Modified: portals/jetspeed-2/trunk/maven-plugin/plugin.jelly
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/maven-plugin/plugin.jelly?rev=331075&r1=331074&r2=331075&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/maven-plugin/plugin.jelly (original)
+++ portals/jetspeed-2/trunk/maven-plugin/plugin.jelly Sat Nov  5 19:44:43 2005
@@ -32,6 +32,7 @@
     <attainGoal name="j2:portal.copy.webapp"/>
     <attainGoal name="j2:portal.conf.project"/>
     <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"/>
@@ -42,6 +43,7 @@
     <attainGoal name="j2:portal.copy.webapp.minimal"/>
     <attainGoal name="j2:portal.conf.project"/>
     <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"/>
@@ -157,7 +159,6 @@
 	</j:if>
   </goal>
  
-
   <goal name="j2:portal.conf.sql" prereqs="j2:_check.required.properties">
     <j:set var="portal.sql.src.dir" value="${org.apache.jetspeed.plugin.root}/plugin-resources/sql"/>
     <j:set var="portal.sql.target.dir" value="${org.apache.jetspeed.portal.home}/${org.apache.jetspeed.portal.sql.dir}"/>
@@ -186,7 +187,19 @@
         <attainGoal name="j2:_copy.rdbms.sql.scripts"/>
       </j:if>
     </j:if>  
-  </goal> 
+  </goal>
+  
+  <goal name="j2:portal.conf.ldap" prereqs="j2:_check.required.properties">
+    <j:set var="portal.ldap.src.dir" value="${org.apache.jetspeed.plugin.root}/plugin-resources/apacheds"/>
     
+    <j:set var="portal.ldap.target.dir" value="${org.apache.jetspeed.portal.home}/${org.apache.jetspeed.portal.ldap.dir}"/>
+    
+    <delete dir="${portal.ldap.target.dir}" failonerror="false"/>
+    <mkdir dir="${portal.ldap.target.dir}"/>
+    
+    <copy todir="${portal.ldap.target.dir}" overwrite="true" verbose="true" failonerror="false"
flatten="true">
+      <fileset dir="${portal.ldap.src.dir}" />
+    </copy>
+  </goal>
   
   <goal name="j2:portal.conf.ojb" prereqs="j2:_check.required.properties">
     <j:set var="portal.target.dir" value="${org.apache.jetspeed.portal.home}/${org.apache.jetspeed.portal.target.dir}"/>
     
@@ -318,6 +331,17 @@
         <attainGoal name="j2:_db.drop"/>
     </goal>
 
+  <!-- =========================================== -->
+  <!-- ============= LDAP MANAGEMENT ============= -->
+  <!-- =========================================== -->
+
+  <goal name="j2:start.ldap.server" prereqs="j2:_check.required.properties">
+    <j:set var="maven.start.ldap.message" value="Starting Apache LDAP"/>
+    <j:set var="org.apache.jetspeed.plugin.ldap.conf" 
+           value="${org.apache.jetspeed.portal.home}/${org.apache.jetspeed.portal.ldap.dir}/apacheds-server.xml"/>
+    <attainGoal name="j2:_start.ldap"/>
+  </goal>
+
   <!-- =============================================== -->
   <!-- ========= JETSPEED PORTLET DEPLOYMENT ========= -->
   <!-- =============================================== -->
@@ -887,6 +911,23 @@
     <j:set var="database.arg.script" value="${portal.sql.dir}/drop.sql"/>
     <j:set var="database.arg.onerror" value="continue"/>
     <attainGoal name="j2:_db.execute"/>
+  </goal>
+  
+  <!-- LDAP internal goals -->
+  <goal name="j2:_start.ldap">
+    <echo message="===================================="/>
+    <echo message="${maven.start.ldap.message}"/>
+    <echo message="===================================="/>
+    <delete dir="target/apacheds/logs"/>
+    <mkdir dir="target/apacheds/logs"/>
+    <echo file="target/apacheds/logs/apacheds.log">${maven.start.ldap.message}</echo>
+    <java classname="org.apache.ldap.server.ServerMain" fork="yes">
+      <classpath>
+        <pathelement path="${maven.repo.local}/${plugin.groupId}/jars/jetspeed-security-schema-${jetspeed.version}.jar"/>
+        <pathelement path="${plugin.getDependencyPath('directory:apacheds-main')}"/>
+      </classpath>
+      <arg value="${org.apache.jetspeed.plugin.ldap.conf}"/>
+    </java>
   </goal>
     
   <!-- Check for availability of a dependency in the local repository and download it
from the remote repo(s)

Modified: portals/jetspeed-2/trunk/maven-plugin/plugin.properties
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/maven-plugin/plugin.properties?rev=331075&r1=331074&r2=331075&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/maven-plugin/plugin.properties (original)
+++ portals/jetspeed-2/trunk/maven-plugin/plugin.properties Sat Nov  5 19:44:43 2005
@@ -11,6 +11,7 @@
 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.ldap.dir=target/portal-ldap
 org.apache.jetspeed.portal.webapp.dir=target/${org.apache.jetspeed.portal.artifactId}
 org.apache.jetspeed.portal.target.dir=target/${org.apache.jetspeed.portal.artifactId}
 

Modified: portals/jetspeed-2/trunk/maven-plugin/project.xml
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/maven-plugin/project.xml?rev=331075&r1=331074&r2=331075&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/maven-plugin/project.xml (original)
+++ portals/jetspeed-2/trunk/maven-plugin/project.xml Sat Nov  5 19:44:43 2005
@@ -52,6 +52,11 @@
             <version>1.0.3</version>
             <type>jar</type>
         </dependency>
+        <dependency>
+            <groupId>directory</groupId>
+            <artifactId>apacheds-main</artifactId>
+            <version>0.9.3</version>
+        </dependency>
     </dependencies>
     <build>
         <sourceDirectory>src/java</sourceDirectory>



---------------------------------------------------------------------
To unsubscribe, e-mail: jetspeed-dev-unsubscribe@portals.apache.org
For additional commands, e-mail: jetspeed-dev-help@portals.apache.org


Mime
View raw message