ate 2004/10/14 12:03:36
Modified: xdocs getting-started.xml
. maven.xml
portal/src/resources jetspeed.xml
portal maven.xml
maven-plugin plugin.jelly
Removed: src/tomcat5-jaas-patch/org/apache/catalina/realm
JAASRealm.java
Log:
Solving Tomcat 5 JAASRealm issue JS2-55. No patch needed anymore!
See: http://issues.apache.org/jira/browse/JS2-55?page=comments#action_54045
As result of this solution version 5.0.28 or higher is now required for J2 if using
Tomcat 5.
Revision Changes Path
1.3 +6 -9 jakarta-jetspeed-2/xdocs/getting-started.xml
Index: getting-started.xml
===================================================================
RCS file: /home/cvs/jakarta-jetspeed-2/xdocs/getting-started.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- getting-started.xml 30 Sep 2004 06:04:09 -0000 1.2
+++ getting-started.xml 14 Oct 2004 19:03:35 -0000 1.3
@@ -31,12 +31,12 @@
</p>
<ul>
<li><a href="http://ant.apache.org/bindownload.cgi";>Ant 1.5</a> or higher</li>
- <li><a href="http://maven.apache.org/start/download.html";>Maven 1.0-rc3</a> or
higher</li>
- <li>Java 1.4 or higher</li>
+ <li><a href="http://maven.apache.org/start/download.html";>Maven 1.0</a> or
higher</li>
+ <li>Java 1.4.2_02 or higher</li>
<li>Servlet 2.3:<br/>
Tomcat 4.1.x<br/>
<b>or</b> <br/>
- Tomcat 5.x</li>
+ Tomcat 5.0.28 or higher</li>
</ul>
</section>
<section name='1. Get Maven Ready'>
@@ -89,12 +89,9 @@
</tr>
</table>
<p>
-<i>If you are using Tomcat 5.x, the allBuild goal described below will install a
-patched version of the JAASRealm class in ${catalina.home}/server/classes to
-enable Jetspeed JAAS based security.
-For more information about this patch see:
-<a href='http://issues.apache.org/jira/browse/JS2-55'>
-Issue 55: JAAS Authentication on Tomcat 5</a></i>.
+<i>If you are using Tomcat 5, make sure to use version 5.0.28 or higher, otherwise
you won't be able to login because
+of an issue with its JAASRealm implementation
+</i>.
</p>
<p>
To develop or deploy Jetspeed with another database (not the default HSQL), see the
property configuration in the
1.104 +0 -17 jakarta-jetspeed-2/maven.xml
Index: maven.xml
===================================================================
RCS file: /home/cvs/jakarta-jetspeed-2/maven.xml,v
retrieving revision 1.103
retrieving revision 1.104
diff -u -r1.103 -r1.104
--- maven.xml 13 Oct 2004 20:01:43 -0000 1.103
+++ maven.xml 14 Oct 2004 19:03:36 -0000 1.104
@@ -169,7 +169,6 @@
<!-- Dependency copying -->
<attainGoal name="copy.shared.deps" />
- <attainGoal name="check.patch.tomcat5.jaas.realm"/>
</goal>
<goal name="copy.shared.deps">
@@ -526,21 +525,5 @@
<fail message="Required property
org.apache.jetspeed.services.autodeployment.user undefined. See
http://portals.apache.org/jetspeed-2/getting-started.html.";
unless="org.apache.jetspeed.services.autodeployment.user"/>
<fail message="Required property
org.apache.jetspeed.services.autodeployment.password undefined. See
http://portals.apache.org/jetspeed-2/getting-started.html.";
unless="org.apache.jetspeed.services.autodeployment.password"/>
</goal>
-
- <goal name="check.patch.tomcat5.jaas.realm"
- description="Check if the Tomcat5 JAASRealm patch is needed">
- <j:set var="catalina_version_major"
value="${org.apache.jetspeed.catalina.version.major}"/>
- <j:if test="${catalina_version_major == '5'}">
- <mkdir dir="${org.apache.jetspeed.server.home}/server/classes"/>
- <javac srcdir="src/tomcat5-jaas-patch"
destdir="${org.apache.jetspeed.server.home}/server/classes">
- <classpath>
- <path refid="maven.dependency.classpath"/>
- <fileset dir="${org.apache.jetspeed.server.home}/server/lib">
- <include name="**/*.jar"/>
- </fileset>
- </classpath>
- </javac>
- </j:if>
- </goal>
</project>
1.6 +1 -0 jakarta-jetspeed-2/portal/src/resources/jetspeed.xml
Index: jetspeed.xml
===================================================================
RCS file: /home/cvs/jakarta-jetspeed-2/portal/src/resources/jetspeed.xml,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- jetspeed.xml 24 May 2004 04:20:45 -0000 1.5
+++ jetspeed.xml 14 Oct 2004 19:03:36 -0000 1.6
@@ -19,6 +19,7 @@
appName="Jetspeed"
userClassNames="org.apache.jetspeed.security.impl.UserPrincipalImpl"
roleClassNames="org.apache.jetspeed.security.impl.RolePrincipalImpl"
+ @USE_CONTEXTCLASSLOADER@
debug="3"/>
<ResourceParams name="jdbc/jetspeed">
1.107 +3 -0 jakarta-jetspeed-2/portal/maven.xml
Index: maven.xml
===================================================================
RCS file: /home/cvs/jakarta-jetspeed-2/portal/maven.xml,v
retrieving revision 1.106
retrieving revision 1.107
diff -u -r1.106 -r1.107
--- maven.xml 13 Oct 2004 20:01:44 -0000 1.106
+++ maven.xml 14 Oct 2004 19:03:36 -0000 1.107
@@ -417,9 +417,11 @@
<j:choose>
<j:when test="${catalina_version_major == '5'}" >
<j:set var="context_dir"
value="${org.apache.jetspeed.server.home}/conf/Catalina/localhost"/>
+ <j:set var="use_contextclassloader"
value='useContextClassLoader="false"'/>
</j:when>
<j:otherwise>
<j:set var="context_dir" value="${org.apache.jetspeed.deploy.war.dir}"/>
+ <j:set var="use_contextclassloader" value=""/>
</j:otherwise>
</j:choose>
<copy file="./src/resources/jetspeed.xml"
tofile="${context_dir}/jetspeed.xml" overwrite="true">
@@ -428,6 +430,7 @@
<filter token="PASSWORD"
value="${org.apache.jetspeed.production.database.password}"/>
<filter token="DRIVER"
value="${org.apache.jetspeed.production.database.driver}"/>
<filter token="URL"
value="${org.apache.jetspeed.production.database.url}"/>
+ <filter token="USE_CONTEXTCLASSLOADER" value="${use_contextclassloader}"/>
</filterset>
</copy>
<attainGoal name="catalina:base-shared" />
1.21 +3 -0 jakarta-jetspeed-2/maven-plugin/plugin.jelly
Index: plugin.jelly
===================================================================
RCS file: /home/cvs/jakarta-jetspeed-2/maven-plugin/plugin.jelly,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- plugin.jelly 1 Oct 2004 15:00:48 -0000 1.20
+++ plugin.jelly 14 Oct 2004 19:03:36 -0000 1.21
@@ -268,9 +268,11 @@
<j:choose>
<j:when test="${catalina_version_major == '5'}" >
<j:set var="context_dir"
value="${org.apache.jetspeed.server.home}/conf/Catalina/localhost"/>
+ <j:set var="use_contextclassloader"
value='useContextClassLoader="false"'/>
</j:when>
<j:otherwise>
<j:set var="context_dir" value="${org.apache.jetspeed.deploy.war.dir}"/>
+ <j:set var="use_contextclassloader" value=""/>
</j:otherwise>
</j:choose>
@@ -280,6 +282,7 @@
<filter token="PASSWORD"
value="${org.apache.jetspeed.production.database.password}"/>
<filter token="DRIVER"
value="${org.apache.jetspeed.production.database.driver}"/>
<filter token="URL"
value="${org.apache.jetspeed.production.database.url}"/>
+ <filter token="USE_CONTEXTCLASSLOADER" value="${use_contextclassloader}"/>
</filterset>
</copy>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
