taylor 2003/12/08 16:24:38
Modified: . .classpath
applications/demo/src/webapp/WEB-INF web.xml
commons/src/webapp/WEB-INF web.xml
portal/src/java/org/apache/jetspeed/tools/pamanager
FileSystemPAM.java
portal/src/webapp/WEB-INF web.xml
Log:
Trying to figure out why pam.deploy is failing today.
Tried changing the DTD URL to
http://java.sun.com/dtd/web-app_2_3.dtd
but it is still failing. Basically I can no longer deploy the demo app, not sure why
that is.
Revision Changes Path
1.10 +2 -6 jakarta-jetspeed-2/.classpath
Index: .classpath
===================================================================
RCS file: /home/cvs/jakarta-jetspeed-2/.classpath,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- .classpath 8 Dec 2003 18:28:46 -0000 1.9
+++ .classpath 9 Dec 2003 00:24:38 -0000 1.10
@@ -8,8 +8,6 @@
<classpathentry excluding="**/CVS/*" kind="src" path="cps/src/test"/>
<classpathentry excluding="**/CVS*" kind="src" path="plugin/src/java"/>
<classpathentry kind="src" path="portal/src/test"/>
- <classpathentry excluding="**/CVS/*" kind="src" path="cornerstone/src/java"/>
- <classpathentry excluding="**/CVS/*" kind="src"
path="cornerstone-demo/src/java"/>
<classpathentry exported="true" kind="con"
path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
<classpathentry exported="true" kind="var"
path="MAVEN_REPO/jdom/jars/jdom-b8.jar"/>
<classpathentry exported="true" kind="var"
path="MAVEN_REPO/commons-betwixt/jars/commons-betwixt-1.0-beta-1.jar"/>
@@ -36,10 +34,8 @@
<classpathentry kind="var" path="MAVEN_REPO/ojb/jars/ojb-1.0.rc3-PATCHED.jar"/>
<classpathentry kind="var" path="MAVEN_REPO/xerces/jars/xerces-2.3.0.jar"/>
<classpathentry kind="var" path="MAVEN_REPO/xml-apis/jars/xml-apis-2.0.2.jar"/>
- <classpathentry kind="var"
path="MAVEN_REPO/velocity/jars/velocity-dep-1.3.1.jar"/>
- <classpathentry kind="var" path="MAVEN_REPO/regexp/jars/regexp-1.2.jar"/>
- <classpathentry kind="var" path="MAVEN_REPO/jmx/jars/jmxtools-1.2.1.jar"/>
- <classpathentry kind="var" path="MAVEN_REPO/jmx/jars/jmxri-1.2.1.jar"/>
<classpathentry kind="src" path="/jakarta-pluto"/>
+ <classpathentry kind="var" path="MAVEN_REPO/regexp/jars/regexp-1.2.jar"/>
+ <classpathentry kind="var"
path="MAVEN_REPO/velocity/jars/velocity-dep-1.3.1.jar"/>
<classpathentry kind="output" path="bin"/>
</classpath>
1.2 +1 -1 jakarta-jetspeed-2/applications/demo/src/webapp/WEB-INF/web.xml
Index: web.xml
===================================================================
RCS file: /home/cvs/jakarta-jetspeed-2/applications/demo/src/webapp/WEB-INF/web.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- web.xml 28 Jul 2003 23:46:34 -0000 1.1
+++ web.xml 9 Dec 2003 00:24:38 -0000 1.2
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE web-app PUBLIC "-//Sun Microsystems, Inc.//DTD Web Application 2.2//EN"
- "http://java.sun.com/j2ee/dtds/web-app_2.2.dtd">
+ "http://java.sun.com/dtd/web-app_2.3.dtd">
<web-app>
<display-name>HelloWorld-DN</display-name>
<description>Hello World Description</description>
1.2 +1 -1 jakarta-jetspeed-2/commons/src/webapp/WEB-INF/web.xml
Index: web.xml
===================================================================
RCS file: /home/cvs/jakarta-jetspeed-2/commons/src/webapp/WEB-INF/web.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- web.xml 10 Oct 2003 05:12:12 -0000 1.1
+++ web.xml 9 Dec 2003 00:24:38 -0000 1.2
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE web-app PUBLIC "-//Sun Microsystems, Inc.//DTD Web Application 2.2//EN"
- "http://java.sun.com/j2ee/dtds/web-app_2.2.dtd">
+ "http://java.sun.com/dtd/web-app_2.3.dtd">
<web-app>
<display-name>Jetspeed Container Application</display-name>
<description>MVC Servlet for Jetspeed Portlet Applications</description>
1.7 +6 -1
jakarta-jetspeed-2/portal/src/java/org/apache/jetspeed/tools/pamanager/FileSystemPAM.java
Index: FileSystemPAM.java
===================================================================
RCS file:
/home/cvs/jakarta-jetspeed-2/portal/src/java/org/apache/jetspeed/tools/pamanager/FileSystemPAM.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- FileSystemPAM.java 26 Nov 2003 20:55:35 -0000 1.6
+++ FileSystemPAM.java 9 Dec 2003 00:24:38 -0000 1.7
@@ -181,6 +181,11 @@
rollback(nState, webAppsDir, paName, app);
throw new PortletApplicationException(e.getMessage());
}
+ catch (Throwable t)
+ {
+ t.printStackTrace();
+
+ }
}
1.4 +1 -1 jakarta-jetspeed-2/portal/src/webapp/WEB-INF/web.xml
Index: web.xml
===================================================================
RCS file: /home/cvs/jakarta-jetspeed-2/portal/src/webapp/WEB-INF/web.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- web.xml 6 Dec 2003 02:06:11 -0000 1.3
+++ web.xml 9 Dec 2003 00:24:38 -0000 1.4
@@ -2,7 +2,7 @@
<!DOCTYPE web-app
PUBLIC "-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN"
- "http://java.sun.com/j2ee/dtds/web-app_2_3.dtd">
+ "http://java.sun.com/dtd/web-app_2_3.dtd">
<web-app>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]