portals-jetspeed-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From a..@apache.org
Subject svn commit: r725977 [35/48] - in /portals/jetspeed-2/portal/trunk: ./ app-servers/security/jboss/src/java/META-INF/jboss-secsvc/ app-servers/security/jboss/src/java/org/apache/jetspeed/appservers/security/jboss/ applications/jetspeed/src/main/javascrip...
Date Fri, 12 Dec 2008 12:07:04 GMT
Modified: portals/jetspeed-2/portal/trunk/etc/xsd/link.xsd
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/etc/xsd/link.xsd?rev=725977&r1=725976&r2=725977&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/etc/xsd/link.xsd (original)
+++ portals/jetspeed-2/portal/trunk/etc/xsd/link.xsd Fri Dec 12 04:06:29 2008
@@ -1,42 +1,42 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
 Licensed to the Apache Software Foundation (ASF) under one or more
 contributor license agreements.  See the NOTICE file distributed with
 this work for additional information regarding copyright ownership.
 The ASF licenses this file to You under the Apache License, Version 2.0
 (the "License"); you may not use this file except in compliance with
-the License.  You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
--->
-<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified"
-		xmlns:tns="http://portals.apache.org/jetspeed"
-		targetNamespace="http://portals.apache.org/jetspeed">
-  <xs:import namespace="http://www.w3.org/XML/1998/namespace" schemaLocation="http://www.w3.org/2001/xml.xsd"/>
-  <xs:element name="link">
-    <xs:complexType>
-      <xs:sequence>
-        <xs:element ref="tns:title"/>
-        <xs:element ref="tns:url"/>
-        <xs:element minOccurs="0" maxOccurs="unbounded" ref="tns:metadata"/>
-      </xs:sequence>
-      <xs:attribute name="target" use="optional" type="xs:string"/>
-      <xs:attribute name="skin" use="optional" type="xs:string"/>
-      <xs:attribute name="hidden" use="optional" type="xs:boolean"/>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="title" type="xs:string"/>
-  <xs:element name="url" type="xs:string"/>
-  <xs:element name="metadata">
-    <xs:complexType mixed="true">
-      <xs:attribute name="name" use="required" type="xs:string"/>
-      <xs:attribute ref="xml:lang" use="required"/>
-    </xs:complexType>
-  </xs:element>
-</xs:schema>
+the License.  You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+-->
+<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified"
+		xmlns:tns="http://portals.apache.org/jetspeed"
+		targetNamespace="http://portals.apache.org/jetspeed">
+  <xs:import namespace="http://www.w3.org/XML/1998/namespace" schemaLocation="http://www.w3.org/2001/xml.xsd"/>
+  <xs:element name="link">
+    <xs:complexType>
+      <xs:sequence>
+        <xs:element ref="tns:title"/>
+        <xs:element ref="tns:url"/>
+        <xs:element minOccurs="0" maxOccurs="unbounded" ref="tns:metadata"/>
+      </xs:sequence>
+      <xs:attribute name="target" use="optional" type="xs:string"/>
+      <xs:attribute name="skin" use="optional" type="xs:string"/>
+      <xs:attribute name="hidden" use="optional" type="xs:boolean"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="title" type="xs:string"/>
+  <xs:element name="url" type="xs:string"/>
+  <xs:element name="metadata">
+    <xs:complexType mixed="true">
+      <xs:attribute name="name" use="required" type="xs:string"/>
+      <xs:attribute ref="xml:lang" use="required"/>
+    </xs:complexType>
+  </xs:element>
+</xs:schema>

Propchange: portals/jetspeed-2/portal/trunk/etc/xsd/link.xsd
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: portals/jetspeed-2/portal/trunk/etc/xsd/page-security.xsd
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/etc/xsd/page-security.xsd?rev=725977&r1=725976&r2=725977&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/etc/xsd/page-security.xsd (original)
+++ portals/jetspeed-2/portal/trunk/etc/xsd/page-security.xsd Fri Dec 12 04:06:29 2008
@@ -1,52 +1,52 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
 Licensed to the Apache Software Foundation (ASF) under one or more
 contributor license agreements.  See the NOTICE file distributed with
 this work for additional information regarding copyright ownership.
 The ASF licenses this file to You under the Apache License, Version 2.0
 (the "License"); you may not use this file except in compliance with
-the License.  You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
--->
-<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified"
-    xmlns:tns="http://portals.apache.org/jetspeed"
-    targetNamespace="http://portals.apache.org/jetspeed">
-  <xs:element name="page-security">
-    <xs:complexType>
-      <xs:choice maxOccurs="unbounded">
-        <xs:element ref="tns:global-security-constraints-ref"/>
-        <xs:element ref="tns:security-constraints-def"/>
-      </xs:choice>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="global-security-constraints-ref" type="xs:string"/>
-  <xs:element name="security-constraints-def">
-    <xs:complexType>
-      <xs:sequence>
-        <xs:element maxOccurs="unbounded" ref="tns:security-constraint"/>
-      </xs:sequence>
-      <xs:attribute name="name" use="required" type="xs:string"/>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="security-constraint">
-    <xs:complexType>
-      <xs:sequence>
-        <xs:choice>
-          <xs:element ref="tns:roles"/>
-          <xs:element ref="tns:users"/>
-        </xs:choice>
-        <xs:element ref="tns:permissions"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="roles" type="xs:string"/>
-  <xs:element name="users" type="xs:string"/>
-  <xs:element name="permissions" type="xs:string"/>
-</xs:schema>
+the License.  You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+-->
+<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified"
+    xmlns:tns="http://portals.apache.org/jetspeed"
+    targetNamespace="http://portals.apache.org/jetspeed">
+  <xs:element name="page-security">
+    <xs:complexType>
+      <xs:choice maxOccurs="unbounded">
+        <xs:element ref="tns:global-security-constraints-ref"/>
+        <xs:element ref="tns:security-constraints-def"/>
+      </xs:choice>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="global-security-constraints-ref" type="xs:string"/>
+  <xs:element name="security-constraints-def">
+    <xs:complexType>
+      <xs:sequence>
+        <xs:element maxOccurs="unbounded" ref="tns:security-constraint"/>
+      </xs:sequence>
+      <xs:attribute name="name" use="required" type="xs:string"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="security-constraint">
+    <xs:complexType>
+      <xs:sequence>
+        <xs:choice>
+          <xs:element ref="tns:roles"/>
+          <xs:element ref="tns:users"/>
+        </xs:choice>
+        <xs:element ref="tns:permissions"/>
+      </xs:sequence>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="roles" type="xs:string"/>
+  <xs:element name="users" type="xs:string"/>
+  <xs:element name="permissions" type="xs:string"/>
+</xs:schema>

Propchange: portals/jetspeed-2/portal/trunk/etc/xsd/page-security.xsd
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: portals/jetspeed-2/portal/trunk/etc/xsd/psml.xsd
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/etc/xsd/psml.xsd?rev=725977&r1=725976&r2=725977&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/etc/xsd/psml.xsd (original)
+++ portals/jetspeed-2/portal/trunk/etc/xsd/psml.xsd Fri Dec 12 04:06:29 2008
@@ -1,106 +1,106 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
 Licensed to the Apache Software Foundation (ASF) under one or more
 contributor license agreements.  See the NOTICE file distributed with
 this work for additional information regarding copyright ownership.
 The ASF licenses this file to You under the Apache License, Version 2.0
 (the "License"); you may not use this file except in compliance with
-the License.  You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
--->
-<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified" 
-	targetNamespace="http://portals.apache.org/jetspeed"
-	xmlns:tns="http://portals.apache.org/jetspeed">
-  <xs:import namespace="http://www.w3.org/XML/1998/namespace" schemaLocation="http://www.w3.org/2001/xml.xsd"/>
-  <xs:element name="page">
-    <xs:complexType>
-      <xs:sequence>
-        <xs:element minOccurs="0" ref="tns:defaults"/>
-        <xs:element minOccurs="0" ref="tns:title"/>
-        <xs:element minOccurs="0" ref="tns:short-title"/>
-        <xs:element minOccurs="0" maxOccurs="unbounded" ref="tns:metadata"/>
-        <xs:element ref="tns:fragment"/>
-        <xs:element minOccurs="0" ref="tns:security-constraints"/>
-      </xs:sequence>
-      <xs:attribute name="id" use="required" type="xs:ID"/>
-      <xs:attribute name="hidden" use="optional" type="xs:boolean"/>
-      <xs:attribute name="version" use="optional" type="xs:double"/>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="defaults">
-    <xs:complexType>
-      <xs:attribute name="layout-decorator" use="required" type="xs:string"/>
-      <xs:attribute name="portlet-decorator" use="required" type="xs:string"/>
-      <xs:attribute name="skin" use="optional" type="xs:string"/>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="title" type="xs:string"/>
-  <xs:element name="short-title" type="xs:string"/>
-  <xs:element name="metadata">
-    <xs:complexType mixed="true">
-      <xs:attribute name="name" use="required" type="xs:string"/>
-      <xs:attribute ref="xml:lang" use="optional"/>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="owner" type="xs:string"/>
-  <xs:element name="security-constraints">
-    <xs:complexType>
-      <xs:sequence>
-        <xs:element minOccurs="0" ref="tns:owner"/>
-        <xs:element minOccurs="0" maxOccurs="unbounded" ref="tns:security-constraint"/>
-        <xs:element minOccurs="0" ref="tns:security-constraints-ref"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="security-constraint">
-    <xs:complexType>
-      <xs:sequence>
-        <xs:element minOccurs="0" ref="tns:users"/>
-        <xs:element minOccurs="0" ref="tns:groups"/>
-        <xs:element minOccurs="0" ref="tns:roles"/>
-        <xs:element minOccurs="0" ref="tns:permissions"/>
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="users" type="xs:string"/>
-  <xs:element name="groups" type="xs:string"/>
-  <xs:element name="roles" type="xs:string"/>
-  <xs:element name="permissions" type="xs:string"/>
-  <xs:element name="security-constraints-ref" type="xs:string"/>
-  <xs:element name="fragment">
-    <xs:complexType>
-      <xs:sequence>
-        <xs:element minOccurs="0" maxOccurs="unbounded" ref="tns:property"/>
-        <xs:element minOccurs="0" maxOccurs="unbounded" ref="tns:fragment" />
-        <xs:element minOccurs="0" maxOccurs="unbounded" ref="tns:preference"/>
-      </xs:sequence>
-      <xs:attribute name="id" use="required" type="xs:ID"/>
-      <xs:attribute name="name" use="required" type="xs:string"/>
-      <xs:attribute name="type" use="required" type="xs:string"/>
-      <xs:attribute name="decorator" use="optional" type="xs:string"/>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="property">
-    <xs:complexType>
-      <xs:attribute name="layout" use="optional" type="xs:string"/>
-      <xs:attribute name="name" use="required" type="xs:string"/>
-      <xs:attribute name="value" use="required" type="xs:string"/>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="value" type="xs:string"/>
-  <xs:element name="preference">
-    <xs:complexType>
-      <xs:sequence>
-        <xs:element ref="tns:value"/>
-      </xs:sequence>
-      <xs:attribute name="name" type="xs:string"/>
-    </xs:complexType>
-  </xs:element>
-</xs:schema>
+the License.  You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+-->
+<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified" 
+	targetNamespace="http://portals.apache.org/jetspeed"
+	xmlns:tns="http://portals.apache.org/jetspeed">
+  <xs:import namespace="http://www.w3.org/XML/1998/namespace" schemaLocation="http://www.w3.org/2001/xml.xsd"/>
+  <xs:element name="page">
+    <xs:complexType>
+      <xs:sequence>
+        <xs:element minOccurs="0" ref="tns:defaults"/>
+        <xs:element minOccurs="0" ref="tns:title"/>
+        <xs:element minOccurs="0" ref="tns:short-title"/>
+        <xs:element minOccurs="0" maxOccurs="unbounded" ref="tns:metadata"/>
+        <xs:element ref="tns:fragment"/>
+        <xs:element minOccurs="0" ref="tns:security-constraints"/>
+      </xs:sequence>
+      <xs:attribute name="id" use="required" type="xs:ID"/>
+      <xs:attribute name="hidden" use="optional" type="xs:boolean"/>
+      <xs:attribute name="version" use="optional" type="xs:double"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="defaults">
+    <xs:complexType>
+      <xs:attribute name="layout-decorator" use="required" type="xs:string"/>
+      <xs:attribute name="portlet-decorator" use="required" type="xs:string"/>
+      <xs:attribute name="skin" use="optional" type="xs:string"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="title" type="xs:string"/>
+  <xs:element name="short-title" type="xs:string"/>
+  <xs:element name="metadata">
+    <xs:complexType mixed="true">
+      <xs:attribute name="name" use="required" type="xs:string"/>
+      <xs:attribute ref="xml:lang" use="optional"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="owner" type="xs:string"/>
+  <xs:element name="security-constraints">
+    <xs:complexType>
+      <xs:sequence>
+        <xs:element minOccurs="0" ref="tns:owner"/>
+        <xs:element minOccurs="0" maxOccurs="unbounded" ref="tns:security-constraint"/>
+        <xs:element minOccurs="0" ref="tns:security-constraints-ref"/>
+      </xs:sequence>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="security-constraint">
+    <xs:complexType>
+      <xs:sequence>
+        <xs:element minOccurs="0" ref="tns:users"/>
+        <xs:element minOccurs="0" ref="tns:groups"/>
+        <xs:element minOccurs="0" ref="tns:roles"/>
+        <xs:element minOccurs="0" ref="tns:permissions"/>
+      </xs:sequence>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="users" type="xs:string"/>
+  <xs:element name="groups" type="xs:string"/>
+  <xs:element name="roles" type="xs:string"/>
+  <xs:element name="permissions" type="xs:string"/>
+  <xs:element name="security-constraints-ref" type="xs:string"/>
+  <xs:element name="fragment">
+    <xs:complexType>
+      <xs:sequence>
+        <xs:element minOccurs="0" maxOccurs="unbounded" ref="tns:property"/>
+        <xs:element minOccurs="0" maxOccurs="unbounded" ref="tns:fragment" />
+        <xs:element minOccurs="0" maxOccurs="unbounded" ref="tns:preference"/>
+      </xs:sequence>
+      <xs:attribute name="id" use="required" type="xs:ID"/>
+      <xs:attribute name="name" use="required" type="xs:string"/>
+      <xs:attribute name="type" use="required" type="xs:string"/>
+      <xs:attribute name="decorator" use="optional" type="xs:string"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="property">
+    <xs:complexType>
+      <xs:attribute name="layout" use="optional" type="xs:string"/>
+      <xs:attribute name="name" use="required" type="xs:string"/>
+      <xs:attribute name="value" use="required" type="xs:string"/>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="value" type="xs:string"/>
+  <xs:element name="preference">
+    <xs:complexType>
+      <xs:sequence>
+        <xs:element ref="tns:value"/>
+      </xs:sequence>
+      <xs:attribute name="name" type="xs:string"/>
+    </xs:complexType>
+  </xs:element>
+</xs:schema>

Propchange: portals/jetspeed-2/portal/trunk/etc/xsd/psml.xsd
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: portals/jetspeed-2/portal/trunk/jetspeed-ant-tasks/src/main/java/org/apache/jetspeed/anttasks/ExecuteJavaSQL.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/jetspeed-ant-tasks/src/main/java/org/apache/jetspeed/anttasks/ExecuteJavaSQL.java?rev=725977&r1=725976&r2=725977&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/jetspeed-ant-tasks/src/main/java/org/apache/jetspeed/anttasks/ExecuteJavaSQL.java (original)
+++ portals/jetspeed-2/portal/trunk/jetspeed-ant-tasks/src/main/java/org/apache/jetspeed/anttasks/ExecuteJavaSQL.java Fri Dec 12 04:06:29 2008
@@ -14,138 +14,138 @@
 * See the License for the specific language governing permissions and
 * limitations under the License.
 */
-/**
- * 
- */
-package org.apache.jetspeed.anttasks;
-
-import java.io.File;
-
-import org.apache.tools.ant.Project;
-import org.apache.tools.ant.Target;
-import org.apache.tools.ant.taskdefs.SQLExec;
-
-/**
- * @author hajo
- * 
- */
-public class ExecuteJavaSQL
-{
-
-	/**
-	 * @param args
-	 */
-	public static void main(String[] args)
-	{
-	    final class TEMPSQL extends SQLExec {
-	        public TEMPSQL() 
-	        {
-		 	    setProject(new Project());
-			    getProject().init();
-			    super.setTaskType("sql");
-			    super.setTaskName("sql");
-			    super.target = new Target();
-	        }	
-	    }
-
-	    boolean autocommit = true;
-	    String driver = null;
-	    String url = null;
-	    String userid = null;
-	    String password = null;
-	    String source = null;
-	    String onError = null;
-	    
-	    
-	    
-       if (args == null)
-            throw new IllegalArgumentException("ExecuteSQL needs to know what to do - no arguments provided!!! ");
-
-        
-        // Parse all the command-line arguments
-        for (int n = 0; n < args.length; n++)
-        {
-        	String argument = args[n].toLowerCase().trim();
-        	
-			if (argument.startsWith("driver="))	           
-			{
-				driver = args[n].substring("driver=".length());
-			}
-			else
-				if (argument.startsWith("url="))
-				{
-					url = args[n].substring("url=".length());
-				}
-				else
-					if (argument.startsWith("userid="))
-					{
-						userid = args[n].substring("userid=".length());
-					}
-					else
-						if (argument.startsWith("password="))
-						{
-							password = args[n].substring("password=".length());
-						}
-						else
-							if (argument.startsWith("src=")) 	       
-							{
-								source = args[n].substring("src=".length());
-							}
-							else
-								if (argument.startsWith("autocommit="))
-								{
-									String s = args[n].substring("src=".length());
-									try
-									{
-										autocommit = Boolean.valueOf(s).booleanValue();
-									}
-									catch (Exception e)
-									{
-										e.printStackTrace();
-									}
-								}
-								else
-									if (argument.startsWith("onerror="))
-									{
-										onError = args[n].substring("onerror=".length());
-									}
-								    else
-							            {
-							                throw new IllegalArgumentException("Unknown argument: "
-							                        + args[n]);
-							            }
-        }
-		TEMPSQL sql = new TEMPSQL();
-		
-		sql.setAutocommit(autocommit);
-		sql.setDriver(driver);
-		sql.setUrl(url);
-		sql.setUserid(userid);
-		sql.setPassword(password);
-		File sqlFile = null;
-		try
-		{
-			sqlFile = new File(source); 
-		}
-		catch (Exception e)
-		{
-			 throw new IllegalArgumentException("File parameter " + source + " invalid : " + e.getLocalizedMessage());
-		}
-		sql.setSrc(sqlFile);
-		try
-		{
-			SQLExec.OnError errorHandling = new SQLExec.OnError();
-			errorHandling.setValue(onError);
-			sql.setOnerror(errorHandling);
-		}
-		catch (Exception e)
-		{
-			 throw new IllegalArgumentException("Error handling parameter " + onError + " invalid : " + e.getLocalizedMessage());
-		}
-			
-
-		
-		sql.execute();
-
-	}
-}
+/**
+ * 
+ */
+package org.apache.jetspeed.anttasks;
+
+import java.io.File;
+
+import org.apache.tools.ant.Project;
+import org.apache.tools.ant.Target;
+import org.apache.tools.ant.taskdefs.SQLExec;
+
+/**
+ * @author hajo
+ * 
+ */
+public class ExecuteJavaSQL
+{
+
+	/**
+	 * @param args
+	 */
+	public static void main(String[] args)
+	{
+	    final class TEMPSQL extends SQLExec {
+	        public TEMPSQL() 
+	        {
+		 	    setProject(new Project());
+			    getProject().init();
+			    super.setTaskType("sql");
+			    super.setTaskName("sql");
+			    super.target = new Target();
+	        }	
+	    }
+
+	    boolean autocommit = true;
+	    String driver = null;
+	    String url = null;
+	    String userid = null;
+	    String password = null;
+	    String source = null;
+	    String onError = null;
+	    
+	    
+	    
+       if (args == null)
+            throw new IllegalArgumentException("ExecuteSQL needs to know what to do - no arguments provided!!! ");
+
+        
+        // Parse all the command-line arguments
+        for (int n = 0; n < args.length; n++)
+        {
+        	String argument = args[n].toLowerCase().trim();
+        	
+			if (argument.startsWith("driver="))	           
+			{
+				driver = args[n].substring("driver=".length());
+			}
+			else
+				if (argument.startsWith("url="))
+				{
+					url = args[n].substring("url=".length());
+				}
+				else
+					if (argument.startsWith("userid="))
+					{
+						userid = args[n].substring("userid=".length());
+					}
+					else
+						if (argument.startsWith("password="))
+						{
+							password = args[n].substring("password=".length());
+						}
+						else
+							if (argument.startsWith("src=")) 	       
+							{
+								source = args[n].substring("src=".length());
+							}
+							else
+								if (argument.startsWith("autocommit="))
+								{
+									String s = args[n].substring("src=".length());
+									try
+									{
+										autocommit = Boolean.valueOf(s).booleanValue();
+									}
+									catch (Exception e)
+									{
+										e.printStackTrace();
+									}
+								}
+								else
+									if (argument.startsWith("onerror="))
+									{
+										onError = args[n].substring("onerror=".length());
+									}
+								    else
+							            {
+							                throw new IllegalArgumentException("Unknown argument: "
+							                        + args[n]);
+							            }
+        }
+		TEMPSQL sql = new TEMPSQL();
+		
+		sql.setAutocommit(autocommit);
+		sql.setDriver(driver);
+		sql.setUrl(url);
+		sql.setUserid(userid);
+		sql.setPassword(password);
+		File sqlFile = null;
+		try
+		{
+			sqlFile = new File(source); 
+		}
+		catch (Exception e)
+		{
+			 throw new IllegalArgumentException("File parameter " + source + " invalid : " + e.getLocalizedMessage());
+		}
+		sql.setSrc(sqlFile);
+		try
+		{
+			SQLExec.OnError errorHandling = new SQLExec.OnError();
+			errorHandling.setValue(onError);
+			sql.setOnerror(errorHandling);
+		}
+		catch (Exception e)
+		{
+			 throw new IllegalArgumentException("Error handling parameter " + onError + " invalid : " + e.getLocalizedMessage());
+		}
+			
+
+		
+		sql.execute();
+
+	}
+}

Propchange: portals/jetspeed-2/portal/trunk/jetspeed-ant-tasks/src/main/java/org/apache/jetspeed/anttasks/ExecuteJavaSQL.java
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: portals/jetspeed-2/portal/trunk/jetspeed-ant-tasks/src/main/java/org/apache/jetspeed/anttasks/ExecuteSQL.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/jetspeed-ant-tasks/src/main/java/org/apache/jetspeed/anttasks/ExecuteSQL.java?rev=725977&r1=725976&r2=725977&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/jetspeed-ant-tasks/src/main/java/org/apache/jetspeed/anttasks/ExecuteSQL.java (original)
+++ portals/jetspeed-2/portal/trunk/jetspeed-ant-tasks/src/main/java/org/apache/jetspeed/anttasks/ExecuteSQL.java Fri Dec 12 04:06:29 2008
@@ -1,114 +1,114 @@
-/*
+/*
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
  * this work for additional information regarding copyright ownership.
  * The ASF licenses this file to You under the Apache License, Version 2.0
  * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.jetspeed.anttasks;
-
-
-import java.sql.Connection;
-import java.sql.SQLException;
-import org.apache.tools.ant.BuildException;
-import org.apache.tools.ant.taskdefs.SQLExec;
-import java.util.Properties;
-import org.apache.tools.ant.Project;;
-
-public class ExecuteSQL extends SQLExec
-{  
-
-  
-	public  void execute() throws BuildException 
-	{
-		
-	
-		try
-		{
-			System.out.println("Executing SQL statement");
-			super.execute();
-		}
-		catch (Exception e)
-		{
-			throw new BuildException(e, getLocation());
-		}
-		finally
-		{
-			if (StartDerby.getConnection(getProject()) != null)
-			{
-				try
-				{
-					if (!(StartDerby.getConnection(getProject()).isClosed()))
-						StartDerby.getConnection(getProject()).close();
-				}
-				catch (Exception e1)
-				{
-					// just a safetyguard
-				}
-				StartDerby.setConnection(getProject(),null);
-			}
-		}
-	}
-		
-
-  /**
-     * Creates a new Connection as using the driver, url, userid and password
-     * specified.
-     *
-     * The calling method is responsible for closing the connection.
-     *
-     * @return Connection the newly created connection.
-     * @throws BuildException if the UserId/Password/Url is not set or there
-     * is no suitable driver or the driver fails to load.
-     */
-  protected Connection getConnection() throws BuildException 
-  {
-	 	if (StartDerby.getDriver(getProject()) == null)
-	 		throw new BuildException("Derby driver not established!", getLocation());		
-  	// reuse excisting connection:
-  	if (StartDerby.getConnection(getProject())!= null)
-  	{
-  		System.out.println("Connection already established");
-  		return StartDerby.getConnection(getProject());
-  	}
-  	// do almost the same as in the orignial JDBC tasks:
-  	
-        if (getUrl() == null) {
-            throw new BuildException("Url attribute must be set!", getLocation());
-        }
-        try {
-
-            log("connecting to " + getUrl(), Project.MSG_VERBOSE);
-            Properties info = new Properties();
-            if (getUserId() != null)
-            	info.put("user", getUserId());
-            if (getPassword() != null)
-            	info.put("password", getPassword());
-            
-            Connection conn = StartDerby.getDriver(getProject()).connect(getUrl(), info);
-            if (conn == null) {
-                // Driver doesn't understand the URL
-                throw new SQLException("No suitable Driver for " + getUrl());
-            }
-
-            conn.setAutoCommit(isAutocommit());
-      		System.out.println("Connection to " + getUrl() + " established");
-      		StartDerby.setConnection(getProject(),conn);
-            return conn;
-        } catch (SQLException e) {
-            throw new BuildException(e, getLocation());
-        }
-
-    }
-  
-  
-}
+ * the License.  You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.jetspeed.anttasks;
+
+
+import java.sql.Connection;
+import java.sql.SQLException;
+import org.apache.tools.ant.BuildException;
+import org.apache.tools.ant.taskdefs.SQLExec;
+import java.util.Properties;
+import org.apache.tools.ant.Project;;
+
+public class ExecuteSQL extends SQLExec
+{  
+
+  
+	public  void execute() throws BuildException 
+	{
+		
+	
+		try
+		{
+			System.out.println("Executing SQL statement");
+			super.execute();
+		}
+		catch (Exception e)
+		{
+			throw new BuildException(e, getLocation());
+		}
+		finally
+		{
+			if (StartDerby.getConnection(getProject()) != null)
+			{
+				try
+				{
+					if (!(StartDerby.getConnection(getProject()).isClosed()))
+						StartDerby.getConnection(getProject()).close();
+				}
+				catch (Exception e1)
+				{
+					// just a safetyguard
+				}
+				StartDerby.setConnection(getProject(),null);
+			}
+		}
+	}
+		
+
+  /**
+     * Creates a new Connection as using the driver, url, userid and password
+     * specified.
+     *
+     * The calling method is responsible for closing the connection.
+     *
+     * @return Connection the newly created connection.
+     * @throws BuildException if the UserId/Password/Url is not set or there
+     * is no suitable driver or the driver fails to load.
+     */
+  protected Connection getConnection() throws BuildException 
+  {
+	 	if (StartDerby.getDriver(getProject()) == null)
+	 		throw new BuildException("Derby driver not established!", getLocation());		
+  	// reuse excisting connection:
+  	if (StartDerby.getConnection(getProject())!= null)
+  	{
+  		System.out.println("Connection already established");
+  		return StartDerby.getConnection(getProject());
+  	}
+  	// do almost the same as in the orignial JDBC tasks:
+  	
+        if (getUrl() == null) {
+            throw new BuildException("Url attribute must be set!", getLocation());
+        }
+        try {
+
+            log("connecting to " + getUrl(), Project.MSG_VERBOSE);
+            Properties info = new Properties();
+            if (getUserId() != null)
+            	info.put("user", getUserId());
+            if (getPassword() != null)
+            	info.put("password", getPassword());
+            
+            Connection conn = StartDerby.getDriver(getProject()).connect(getUrl(), info);
+            if (conn == null) {
+                // Driver doesn't understand the URL
+                throw new SQLException("No suitable Driver for " + getUrl());
+            }
+
+            conn.setAutoCommit(isAutocommit());
+      		System.out.println("Connection to " + getUrl() + " established");
+      		StartDerby.setConnection(getProject(),conn);
+            return conn;
+        } catch (SQLException e) {
+            throw new BuildException(e, getLocation());
+        }
+
+    }
+  
+  
+}

Propchange: portals/jetspeed-2/portal/trunk/jetspeed-ant-tasks/src/main/java/org/apache/jetspeed/anttasks/ExecuteSQL.java
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: portals/jetspeed-2/portal/trunk/jetspeed-ant-tasks/src/main/java/org/apache/jetspeed/anttasks/StartDatabase.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/jetspeed-ant-tasks/src/main/java/org/apache/jetspeed/anttasks/StartDatabase.java?rev=725977&r1=725976&r2=725977&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/jetspeed-ant-tasks/src/main/java/org/apache/jetspeed/anttasks/StartDatabase.java (original)
+++ portals/jetspeed-2/portal/trunk/jetspeed-ant-tasks/src/main/java/org/apache/jetspeed/anttasks/StartDatabase.java Fri Dec 12 04:06:29 2008
@@ -1,72 +1,72 @@
-/*
+/*
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
  * this work for additional information regarding copyright ownership.
  * The ASF licenses this file to You under the Apache License, Version 2.0
  * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.jetspeed.anttasks;
-
-import org.apache.tools.ant.BuildException;
-import org.apache.tools.ant.taskdefs.JDBCTask;
-import java.sql.Connection;
-import java.sql.SQLException;
-import java.util.Properties;
-import org.apache.tools.ant.Project;
-
-public class StartDatabase
-  extends JDBCTask  {
-
-  
-  
-  
-  public void execute() 
-    throws BuildException 
-    {
-	    if (StartDerby.getDriver(getProject()) == null)
-	    	 throw new BuildException("Derby driver not established!", getLocation());
-	  	// reuse excisting connection:
-	  	if (StartDerby.getConnection(getProject()) != null)
-	  	{
-			System.out.println("Connection already established");
-			return;
-	  	}
-	  	// do almost the same as in the orignial JDBC tasks:
-	  	
-	        if (getUrl() == null) {
-	            throw new BuildException("Url attribute must be set!", getLocation());
-	        }
-	        try {
-
-	            log("connecting to " + getUrl(), Project.MSG_VERBOSE);
-	            Properties info = new Properties();
-	            if (getUserId() != null)
-	            	info.put("user", getUserId());
-	            if (getPassword() != null)
-	            	info.put("password", getPassword());
-	            
-	            Connection conn = StartDerby.getDriver(getProject()).connect(getUrl(), info);
-	            if (conn == null) {
-	                // Driver doesn't understand the URL
-	                throw new SQLException("No suitable Driver for " +  getUrl());
-	            }
-
-	            conn.setAutoCommit(isAutocommit());
-	            StartDerby.setConnection(getProject(),conn);
-	            System.out.println("Derby connected to " + getUrl());
-	            return;
-	        } catch (SQLException e) {
-	            throw new BuildException(e, getLocation());
-	        }
- }
-  
-}
+ * the License.  You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.jetspeed.anttasks;
+
+import org.apache.tools.ant.BuildException;
+import org.apache.tools.ant.taskdefs.JDBCTask;
+import java.sql.Connection;
+import java.sql.SQLException;
+import java.util.Properties;
+import org.apache.tools.ant.Project;
+
+public class StartDatabase
+  extends JDBCTask  {
+
+  
+  
+  
+  public void execute() 
+    throws BuildException 
+    {
+	    if (StartDerby.getDriver(getProject()) == null)
+	    	 throw new BuildException("Derby driver not established!", getLocation());
+	  	// reuse excisting connection:
+	  	if (StartDerby.getConnection(getProject()) != null)
+	  	{
+			System.out.println("Connection already established");
+			return;
+	  	}
+	  	// do almost the same as in the orignial JDBC tasks:
+	  	
+	        if (getUrl() == null) {
+	            throw new BuildException("Url attribute must be set!", getLocation());
+	        }
+	        try {
+
+	            log("connecting to " + getUrl(), Project.MSG_VERBOSE);
+	            Properties info = new Properties();
+	            if (getUserId() != null)
+	            	info.put("user", getUserId());
+	            if (getPassword() != null)
+	            	info.put("password", getPassword());
+	            
+	            Connection conn = StartDerby.getDriver(getProject()).connect(getUrl(), info);
+	            if (conn == null) {
+	                // Driver doesn't understand the URL
+	                throw new SQLException("No suitable Driver for " +  getUrl());
+	            }
+
+	            conn.setAutoCommit(isAutocommit());
+	            StartDerby.setConnection(getProject(),conn);
+	            System.out.println("Derby connected to " + getUrl());
+	            return;
+	        } catch (SQLException e) {
+	            throw new BuildException(e, getLocation());
+	        }
+ }
+  
+}

Propchange: portals/jetspeed-2/portal/trunk/jetspeed-ant-tasks/src/main/java/org/apache/jetspeed/anttasks/StartDatabase.java
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: portals/jetspeed-2/portal/trunk/jetspeed-ant-tasks/src/main/java/org/apache/jetspeed/anttasks/StartDerby.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/jetspeed-ant-tasks/src/main/java/org/apache/jetspeed/anttasks/StartDerby.java?rev=725977&r1=725976&r2=725977&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/jetspeed-ant-tasks/src/main/java/org/apache/jetspeed/anttasks/StartDerby.java (original)
+++ portals/jetspeed-2/portal/trunk/jetspeed-ant-tasks/src/main/java/org/apache/jetspeed/anttasks/StartDerby.java Fri Dec 12 04:06:29 2008
@@ -1,127 +1,127 @@
-/*
+/*
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
  * this work for additional information regarding copyright ownership.
  * The ASF licenses this file to You under the Apache License, Version 2.0
  * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.jetspeed.anttasks;
-
-import org.apache.tools.ant.BuildException;
-import org.apache.tools.ant.Task;
-import java.sql.Driver;
-import java.sql.Connection;
-import org.apache.tools.ant.Project;
-import java.util.Hashtable;
-
-
-public class StartDerby 
-  extends Task {
- 
-//	public static Driver DERBY_DRIVER = null;
-//	public static Connection  DERBY_CONNECTION = null;
-
-  public void execute() 
-    throws BuildException {
-      try {
-  	   	if (StartDerby.getDriver(getProject()) != null)
-       	{
-        		System.out.println("Derby Driver has ALREADY BEEN ESTABLISHED!");
-        		return;
-       	}
-  	  StartDerby.setDriver(getProject(),(java.sql.Driver)(Class.forName("org.apache.derby.jdbc.EmbeddedDriver").newInstance()));
-        System.out.println("Derby Driver has been started!");
-      } catch (Exception e) {
-        System.out.println(
-          "Derby could not start. This is most likely " +
-          "due to missing Derby JAR files. Please check your classpath" +
-          "and try again.");
-        throw new BuildException(e);
-      }
-  }
-  
-  public static void setDriver(Project project, Driver d)
-  {
-	  try
-	  {
-		  if (d != null)
-		  {
-			  project.addReference("DRIVER",d);
-			  System.out.println("Driver reference in Project set ");
-		  }
-		  else
-		  {
-			  Hashtable h = project.getReferences();
-			  h.remove("DRIVER");
-			  System.out.println("Driver reference in Project removed ");
-		  }
-	  }
-	  catch (Exception e)
-	  {
-		  System.out.println("Could't SET Driver reference in Project : " + e.getLocalizedMessage());
-		  
-	  }
-  }
-  public static Driver getDriver(Project project)
-  {
-	  try
-	  {
-		  Object o = project.getReference("DRIVER");
-		  if (o != null)
-			  return (Driver)o;
-		  else return null;
-	  }
-	  catch (Exception e)
-	  {
-		  System.out.println("Could't get Driver reference in Project : " + e.getLocalizedMessage());
-		  return null;
-	  }
-  }
-  
-  public static void setConnection(Project project, Connection d)
-  {
-	  try
-	  {
-		  if (d != null)
-		  {
-			  project.addReference("Connection",d);
-			  System.out.println("Connection reference in Project set ");
-		  }
-		  else
-		  {
-			  Hashtable h = project.getReferences();
-			  h.remove("Connection");
-			  System.out.println("Connection reference in Project removed ");
-		  }
-	  }
-	  catch (Exception e)
-	  {
-		  System.out.println("Could't SET Connection reference in Project : " + e.getLocalizedMessage());
-		  
-	  }
-  }
-  public static Connection getConnection(Project project)
-  {
-	  try
-	  {
-		  Object o = project.getReference("Connection");
-		  if (o != null)
-			  return (Connection)o;
-		  else return null;
-	  }
-	  catch (Exception e)
-	  {
-		  System.out.println("Could't get Connection reference in Project : " + e.getLocalizedMessage());
-		  return null;
-	  }
-  }
-}
+ * the License.  You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.jetspeed.anttasks;
+
+import org.apache.tools.ant.BuildException;
+import org.apache.tools.ant.Task;
+import java.sql.Driver;
+import java.sql.Connection;
+import org.apache.tools.ant.Project;
+import java.util.Hashtable;
+
+
+public class StartDerby 
+  extends Task {
+ 
+//	public static Driver DERBY_DRIVER = null;
+//	public static Connection  DERBY_CONNECTION = null;
+
+  public void execute() 
+    throws BuildException {
+      try {
+  	   	if (StartDerby.getDriver(getProject()) != null)
+       	{
+        		System.out.println("Derby Driver has ALREADY BEEN ESTABLISHED!");
+        		return;
+       	}
+  	  StartDerby.setDriver(getProject(),(java.sql.Driver)(Class.forName("org.apache.derby.jdbc.EmbeddedDriver").newInstance()));
+        System.out.println("Derby Driver has been started!");
+      } catch (Exception e) {
+        System.out.println(
+          "Derby could not start. This is most likely " +
+          "due to missing Derby JAR files. Please check your classpath" +
+          "and try again.");
+        throw new BuildException(e);
+      }
+  }
+  
+  public static void setDriver(Project project, Driver d)
+  {
+	  try
+	  {
+		  if (d != null)
+		  {
+			  project.addReference("DRIVER",d);
+			  System.out.println("Driver reference in Project set ");
+		  }
+		  else
+		  {
+			  Hashtable h = project.getReferences();
+			  h.remove("DRIVER");
+			  System.out.println("Driver reference in Project removed ");
+		  }
+	  }
+	  catch (Exception e)
+	  {
+		  System.out.println("Could't SET Driver reference in Project : " + e.getLocalizedMessage());
+		  
+	  }
+  }
+  public static Driver getDriver(Project project)
+  {
+	  try
+	  {
+		  Object o = project.getReference("DRIVER");
+		  if (o != null)
+			  return (Driver)o;
+		  else return null;
+	  }
+	  catch (Exception e)
+	  {
+		  System.out.println("Could't get Driver reference in Project : " + e.getLocalizedMessage());
+		  return null;
+	  }
+  }
+  
+  public static void setConnection(Project project, Connection d)
+  {
+	  try
+	  {
+		  if (d != null)
+		  {
+			  project.addReference("Connection",d);
+			  System.out.println("Connection reference in Project set ");
+		  }
+		  else
+		  {
+			  Hashtable h = project.getReferences();
+			  h.remove("Connection");
+			  System.out.println("Connection reference in Project removed ");
+		  }
+	  }
+	  catch (Exception e)
+	  {
+		  System.out.println("Could't SET Connection reference in Project : " + e.getLocalizedMessage());
+		  
+	  }
+  }
+  public static Connection getConnection(Project project)
+  {
+	  try
+	  {
+		  Object o = project.getReference("Connection");
+		  if (o != null)
+			  return (Connection)o;
+		  else return null;
+	  }
+	  catch (Exception e)
+	  {
+		  System.out.println("Could't get Connection reference in Project : " + e.getLocalizedMessage());
+		  return null;
+	  }
+  }
+}

Propchange: portals/jetspeed-2/portal/trunk/jetspeed-ant-tasks/src/main/java/org/apache/jetspeed/anttasks/StartDerby.java
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: portals/jetspeed-2/portal/trunk/jetspeed-ant-tasks/src/main/java/org/apache/jetspeed/anttasks/StopDatabase.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/jetspeed-ant-tasks/src/main/java/org/apache/jetspeed/anttasks/StopDatabase.java?rev=725977&r1=725976&r2=725977&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/jetspeed-ant-tasks/src/main/java/org/apache/jetspeed/anttasks/StopDatabase.java (original)
+++ portals/jetspeed-2/portal/trunk/jetspeed-ant-tasks/src/main/java/org/apache/jetspeed/anttasks/StopDatabase.java Fri Dec 12 04:06:29 2008
@@ -1,62 +1,62 @@
-/*
+/*
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
  * this work for additional information regarding copyright ownership.
  * The ASF licenses this file to You under the Apache License, Version 2.0
  * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.jetspeed.anttasks;
-
-import org.apache.tools.ant.BuildException;
-import org.apache.tools.ant.Task;
-import java.sql.SQLException;
-
-
-public class StopDatabase
-  extends Task {
-
-  private String url;
-
-  public String getUrl() {
-    return url;
-  }
-  
-  public void setUrl(String url) {
-    this.url = url;
-  }
-  
-  public void execute() 
-    throws BuildException {
-  	if (StartDerby.getDriver(getProject()) == null)
-	{
-		System.out.println("Derby Driver has NOT BEEN ESTABLISHED!");
-		return ; // already closed;
-	}
-	if (StartDerby.getConnection(getProject()) != null)
-	{
-		try
-		{
-			StartDerby.getConnection(getProject()).close();
-			System.out.println("Derby Connection successfully closed!");
-		}
-		catch (SQLException e)
-		{
-			throw new BuildException(e, getLocation());
-		}
-		StartDerby.setConnection(getProject(),null);
-		
-	}
-	else
-		System.out.println("Derby Connection has already been closed!");
- }
-  
-}
+ * the License.  You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.jetspeed.anttasks;
+
+import org.apache.tools.ant.BuildException;
+import org.apache.tools.ant.Task;
+import java.sql.SQLException;
+
+
+public class StopDatabase
+  extends Task {
+
+  private String url;
+
+  public String getUrl() {
+    return url;
+  }
+  
+  public void setUrl(String url) {
+    this.url = url;
+  }
+  
+  public void execute() 
+    throws BuildException {
+  	if (StartDerby.getDriver(getProject()) == null)
+	{
+		System.out.println("Derby Driver has NOT BEEN ESTABLISHED!");
+		return ; // already closed;
+	}
+	if (StartDerby.getConnection(getProject()) != null)
+	{
+		try
+		{
+			StartDerby.getConnection(getProject()).close();
+			System.out.println("Derby Connection successfully closed!");
+		}
+		catch (SQLException e)
+		{
+			throw new BuildException(e, getLocation());
+		}
+		StartDerby.setConnection(getProject(),null);
+		
+	}
+	else
+		System.out.println("Derby Connection has already been closed!");
+ }
+  
+}

Propchange: portals/jetspeed-2/portal/trunk/jetspeed-ant-tasks/src/main/java/org/apache/jetspeed/anttasks/StopDatabase.java
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: portals/jetspeed-2/portal/trunk/jetspeed-ant-tasks/src/main/java/org/apache/jetspeed/anttasks/StopDerby.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/jetspeed-ant-tasks/src/main/java/org/apache/jetspeed/anttasks/StopDerby.java?rev=725977&r1=725976&r2=725977&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/jetspeed-ant-tasks/src/main/java/org/apache/jetspeed/anttasks/StopDerby.java (original)
+++ portals/jetspeed-2/portal/trunk/jetspeed-ant-tasks/src/main/java/org/apache/jetspeed/anttasks/StopDerby.java Fri Dec 12 04:06:29 2008
@@ -1,70 +1,70 @@
-/*
+/*
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
  * this work for additional information regarding copyright ownership.
  * The ASF licenses this file to You under the Apache License, Version 2.0
  * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.jetspeed.anttasks;
-
-import org.apache.tools.ant.BuildException;
-import org.apache.tools.ant.Task;
-import java.sql.SQLException;
-import java.util.Properties;
-
-
-public class StopDerby 
-  extends Task {
-  
-
-  public void execute() 
-    throws BuildException 
-    {
-	  	if (StartDerby.getDriver(getProject()) == null)
-		{
-			System.out.println("Derby Driver has NOT BEEN ESTABLISHED!");
-			return ; // already closed;
-		}
-		if (StartDerby.getConnection(getProject()) != null)
-		{
-			try
-			{
-				StartDerby.getConnection(getProject()).close();
-				System.out.println("Derby Connection successfully closed!");
-			}
-			catch (SQLException e)
-			{
-				throw new BuildException(e, getLocation());
-			}
-			StartDerby.setConnection(getProject(),null);
-			
-		}
-		else
-    		System.out.println("Derby Connection has already been closed!");
-    	
-//    	getConnection("jdbc:derby:;shutdown=true");
-        Properties info = new Properties();
-      	info.put("shutdown",Boolean.TRUE);
-        System.out.println("Derby Driver sutting down!");
-        try
-        {
-        	StartDerby.getDriver(getProject()).connect("jdbc:derby:",info);
-    	} catch (Exception e) 
-    	{
-    		System.out.println("Derby has been shutdown!");
-        }
-
-    	StartDerby.setDriver(getProject(),null);
-        System.out.println("Derby Driver has been shutdown!");
-     }
-  
-}
+ * the License.  You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.jetspeed.anttasks;
+
+import org.apache.tools.ant.BuildException;
+import org.apache.tools.ant.Task;
+import java.sql.SQLException;
+import java.util.Properties;
+
+
+public class StopDerby 
+  extends Task {
+  
+
+  public void execute() 
+    throws BuildException 
+    {
+	  	if (StartDerby.getDriver(getProject()) == null)
+		{
+			System.out.println("Derby Driver has NOT BEEN ESTABLISHED!");
+			return ; // already closed;
+		}
+		if (StartDerby.getConnection(getProject()) != null)
+		{
+			try
+			{
+				StartDerby.getConnection(getProject()).close();
+				System.out.println("Derby Connection successfully closed!");
+			}
+			catch (SQLException e)
+			{
+				throw new BuildException(e, getLocation());
+			}
+			StartDerby.setConnection(getProject(),null);
+			
+		}
+		else
+    		System.out.println("Derby Connection has already been closed!");
+    	
+//    	getConnection("jdbc:derby:;shutdown=true");
+        Properties info = new Properties();
+      	info.put("shutdown",Boolean.TRUE);
+        System.out.println("Derby Driver sutting down!");
+        try
+        {
+        	StartDerby.getDriver(getProject()).connect("jdbc:derby:",info);
+    	} catch (Exception e) 
+    	{
+    		System.out.println("Derby has been shutdown!");
+        }
+
+    	StartDerby.setDriver(getProject(),null);
+        System.out.println("Derby Driver has been shutdown!");
+     }
+  
+}

Propchange: portals/jetspeed-2/portal/trunk/jetspeed-ant-tasks/src/main/java/org/apache/jetspeed/anttasks/StopDerby.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: portals/jetspeed-2/portal/trunk/jetspeed-api/src/main/java/org/apache/jetspeed/PortalContext.java
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: portals/jetspeed-2/portal/trunk/jetspeed-api/src/main/java/org/apache/jetspeed/administration/AdministrationEmailException.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/jetspeed-api/src/main/java/org/apache/jetspeed/administration/AdministrationEmailException.java?rev=725977&r1=725976&r2=725977&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/jetspeed-api/src/main/java/org/apache/jetspeed/administration/AdministrationEmailException.java (original)
+++ portals/jetspeed-2/portal/trunk/jetspeed-api/src/main/java/org/apache/jetspeed/administration/AdministrationEmailException.java Fri Dec 12 04:06:29 2008
@@ -1,59 +1,59 @@
-/*
+/*
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
  * this work for additional information regarding copyright ownership.
  * The ASF licenses this file to You under the Apache License, Version 2.0
  * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.jetspeed.administration;
-
-import org.apache.jetspeed.exception.JetspeedException;
-import org.apache.jetspeed.i18n.KeyedMessage;
-
-/**
- * Administration Email exceptions
- * 
- * @author <a href="mailto:taylor@apache.org">David Sean Taylor</a>
- * @version $Id: $
- */
-public class AdministrationEmailException extends JetspeedException
-{
-    public AdministrationEmailException()
-    {
-        super();
-    }
-
-    public AdministrationEmailException(KeyedMessage keyedMessage, Throwable nested)
-    {
-        super(keyedMessage, nested);
-    }
-
-    public AdministrationEmailException(KeyedMessage typedMessage)
-    {
-        super(typedMessage);
-    }
-
-    public AdministrationEmailException(String msg, Throwable nested)
-    {
-        super(msg, nested);
-    }
-
-    public AdministrationEmailException(String message)
-    {
-        super(message);
-    }
-
-    public AdministrationEmailException(Throwable nested)
-    {
-        super(nested);
-    }
-}
+ * the License.  You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.jetspeed.administration;
+
+import org.apache.jetspeed.exception.JetspeedException;
+import org.apache.jetspeed.i18n.KeyedMessage;
+
+/**
+ * Administration Email exceptions
+ * 
+ * @author <a href="mailto:taylor@apache.org">David Sean Taylor</a>
+ * @version $Id: $
+ */
+public class AdministrationEmailException extends JetspeedException
+{
+    public AdministrationEmailException()
+    {
+        super();
+    }
+
+    public AdministrationEmailException(KeyedMessage keyedMessage, Throwable nested)
+    {
+        super(keyedMessage, nested);
+    }
+
+    public AdministrationEmailException(KeyedMessage typedMessage)
+    {
+        super(typedMessage);
+    }
+
+    public AdministrationEmailException(String msg, Throwable nested)
+    {
+        super(msg, nested);
+    }
+
+    public AdministrationEmailException(String message)
+    {
+        super(message);
+    }
+
+    public AdministrationEmailException(Throwable nested)
+    {
+        super(nested);
+    }
+}

Propchange: portals/jetspeed-2/portal/trunk/jetspeed-api/src/main/java/org/apache/jetspeed/administration/AdministrationEmailException.java
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: portals/jetspeed-2/portal/trunk/jetspeed-api/src/main/java/org/apache/jetspeed/administration/PortalAdministration.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/jetspeed-api/src/main/java/org/apache/jetspeed/administration/PortalAdministration.java?rev=725977&r1=725976&r2=725977&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/jetspeed-api/src/main/java/org/apache/jetspeed/administration/PortalAdministration.java (original)
+++ portals/jetspeed-2/portal/trunk/jetspeed-api/src/main/java/org/apache/jetspeed/administration/PortalAdministration.java Fri Dec 12 04:06:29 2008
@@ -1,167 +1,167 @@
-/*
+/*
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
  * this work for additional information regarding copyright ownership.
  * The ASF licenses this file to You under the Apache License, Version 2.0
  * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.jetspeed.administration;
-
-import java.util.List;
-import java.util.Map;
-
-import javax.portlet.PortletConfig;
-import javax.portlet.PortletRequest;
-import javax.portlet.PortletResponse;
-import org.apache.jetspeed.security.User;
-
-/**
- * PortalAdministration
- * 
- * Aggregate portal administration functions:
- *  - Emails
- *  - Registration
- *  - Password Generation
- * 
- * @author <a href="mailto:taylor@apache.org">David Sean Taylor</a>
- * @version $Id: $
- */
-public interface PortalAdministration
-{    
-    /**
-     * Registers and creates a new user, assigning userInfo, roles, groups, 
-     * profiling rules and a folder template. If any values are null, defaults
-     * are used from the system wide configuration.
-     * 
-     * @param userName Unique user principal identifier
-     * @param password Password for this user
-     * @param roles A list of roles to assign to this user
-     * @param groups A list of groups to assign to this user
-     * @param userInfo Portlet API User Information Attributes name value pairs (PLT.D) 
-     * @param rules A map of name value pairs of profiling rules. 
-     *              Well known rules names are 'page' and 'menu' 
-     * @param folderTemplate The full PSML path name of a folder to be deep
-     *               copied as the new user's set of folders, pages, links
-     * @param subsite The subsite folder to place the new user in
-     * @since 2.1.2              
-     */
-    void registerUser(String userName, 
-                      String password, 
-                      List roles, 
-                      List groups,
-                      Map userInfo,                       
-                      Map rules,
-                      String template,
-                      String subsiteFolder)
-        throws RegistrationException;
-
-    void registerUser(String userName, 
-            String password, 
-            List roles, 
-            List groups,
-            Map userInfo,                       
-            Map rules,
-            String template)
-        throws RegistrationException;
- 
-    /**
-     * Register a new user using all default values
-     * 
-     * @param userName
-     * @param password
-     */
-    void registerUser(String userName, String password)
-        throws RegistrationException;
-    
-    /**
-     * Generate a unique password
-     * 
-     * @return unique password
-     */
-    String generatePassword();
-    
-    /**
-     * Helper to send an email to a recipient
-     * 
-     * @param recipient the email address of the recipient
-     * @param localizedSubject the subject of the email as a localized string
-     * @param message the email message content
-     * @parm userAttributes map of user attributes
-     * @throws AdministrationEmailException
-     */
-    public void sendEmail(PortletConfig portletConfig,
-                          String emailAddress, 
-                          String localizedSubject, 
-                          String templatePath,
-                          Map userAttributes)
-        throws AdministrationEmailException;
-    
-    /**
-     * Helper to send an email to a recipient without the portal default sender, and without mail merge
-     * 
-     * @param from the email address of the sender
-     * @param subject the subject of the email
-     * @param to the recipient email address
-     * @param text the message text
-     * @throws AdministrationEmailException
-     */
-    public void sendEmail(String from, String subject, String to, String text) throws AdministrationEmailException;    
-    
-    /**
-     * Lookup a user given an email address
-     * 
-     * @param email Given email address
-     * @return a Jetspeed <code>User</code>, or throw exception if not found
-     * @throws AdministrationEmailException
-     */
-    public User lookupUserFromEmail(String email)
-    throws AdministrationEmailException;
-    
-    /**
-     * Provide a common way to get portal URLs
-     * Necessary for generating return URLs for features such as 
-     * forgotten password. The URL generated will be a combination
-     * of the Jetspeed base URL plus the path parameter appended 
-     * Example:
-     *  base URL = http://www.apache.org/jetspeed/portal
-     *      path = /system/forgotten-password.psml
-     *  Returns: 
-     *     http://www.apache.org/jetspeed/portal/system/forgotten-password.psml
-     *     
-     * @param request The portlet request.
-     * @param response The portlet response, used to encode the path
-     * @param path The relative path to a portal resource
-     * @return the base Jetspeed portal URL plus the appended path parameter
-     */
-    String getPortalURL(PortletRequest request, PortletResponse response, String path);
-    
-    
-    /**
-     * @param guid    The ID which is passed throughte URL to the user
-     * @return
-     */
-    public Map getNewLoginInfo(String guid);
-    /**
-     * @param guid    the ID which is passed through the URL to the user.. 
-     * @param info    a Map, info from which will be used to reset the password
-     *                the password in this case is NOT encrypted, but this should probably
-     *                change if this information is stored on disk... ie a database
-     */
-    public void putNewLoginInfo(String guid, Map info);
-    
-    /**
-     * @param guid    the ID which will be removed from the storage when the info is no longer valid
-     */
-    public void removeNewLoginInfo(String guid);
-        
-}
-
+ * the License.  You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.jetspeed.administration;
+
+import java.util.List;
+import java.util.Map;
+
+import javax.portlet.PortletConfig;
+import javax.portlet.PortletRequest;
+import javax.portlet.PortletResponse;
+import org.apache.jetspeed.security.User;
+
+/**
+ * PortalAdministration
+ * 
+ * Aggregate portal administration functions:
+ *  - Emails
+ *  - Registration
+ *  - Password Generation
+ * 
+ * @author <a href="mailto:taylor@apache.org">David Sean Taylor</a>
+ * @version $Id: $
+ */
+public interface PortalAdministration
+{    
+    /**
+     * Registers and creates a new user, assigning userInfo, roles, groups, 
+     * profiling rules and a folder template. If any values are null, defaults
+     * are used from the system wide configuration.
+     * 
+     * @param userName Unique user principal identifier
+     * @param password Password for this user
+     * @param roles A list of roles to assign to this user
+     * @param groups A list of groups to assign to this user
+     * @param userInfo Portlet API User Information Attributes name value pairs (PLT.D) 
+     * @param rules A map of name value pairs of profiling rules. 
+     *              Well known rules names are 'page' and 'menu' 
+     * @param folderTemplate The full PSML path name of a folder to be deep
+     *               copied as the new user's set of folders, pages, links
+     * @param subsite The subsite folder to place the new user in
+     * @since 2.1.2              
+     */
+    void registerUser(String userName, 
+                      String password, 
+                      List roles, 
+                      List groups,
+                      Map userInfo,                       
+                      Map rules,
+                      String template,
+                      String subsiteFolder)
+        throws RegistrationException;
+
+    void registerUser(String userName, 
+            String password, 
+            List roles, 
+            List groups,
+            Map userInfo,                       
+            Map rules,
+            String template)
+        throws RegistrationException;
+ 
+    /**
+     * Register a new user using all default values
+     * 
+     * @param userName
+     * @param password
+     */
+    void registerUser(String userName, String password)
+        throws RegistrationException;
+    
+    /**
+     * Generate a unique password
+     * 
+     * @return unique password
+     */
+    String generatePassword();
+    
+    /**
+     * Helper to send an email to a recipient
+     * 
+     * @param recipient the email address of the recipient
+     * @param localizedSubject the subject of the email as a localized string
+     * @param message the email message content
+     * @parm userAttributes map of user attributes
+     * @throws AdministrationEmailException
+     */
+    public void sendEmail(PortletConfig portletConfig,
+                          String emailAddress, 
+                          String localizedSubject, 
+                          String templatePath,
+                          Map userAttributes)
+        throws AdministrationEmailException;
+    
+    /**
+     * Helper to send an email to a recipient without the portal default sender, and without mail merge
+     * 
+     * @param from the email address of the sender
+     * @param subject the subject of the email
+     * @param to the recipient email address
+     * @param text the message text
+     * @throws AdministrationEmailException
+     */
+    public void sendEmail(String from, String subject, String to, String text) throws AdministrationEmailException;    
+    
+    /**
+     * Lookup a user given an email address
+     * 
+     * @param email Given email address
+     * @return a Jetspeed <code>User</code>, or throw exception if not found
+     * @throws AdministrationEmailException
+     */
+    public User lookupUserFromEmail(String email)
+    throws AdministrationEmailException;
+    
+    /**
+     * Provide a common way to get portal URLs
+     * Necessary for generating return URLs for features such as 
+     * forgotten password. The URL generated will be a combination
+     * of the Jetspeed base URL plus the path parameter appended 
+     * Example:
+     *  base URL = http://www.apache.org/jetspeed/portal
+     *      path = /system/forgotten-password.psml
+     *  Returns: 
+     *     http://www.apache.org/jetspeed/portal/system/forgotten-password.psml
+     *     
+     * @param request The portlet request.
+     * @param response The portlet response, used to encode the path
+     * @param path The relative path to a portal resource
+     * @return the base Jetspeed portal URL plus the appended path parameter
+     */
+    String getPortalURL(PortletRequest request, PortletResponse response, String path);
+    
+    
+    /**
+     * @param guid    The ID which is passed throughte URL to the user
+     * @return
+     */
+    public Map getNewLoginInfo(String guid);
+    /**
+     * @param guid    the ID which is passed through the URL to the user.. 
+     * @param info    a Map, info from which will be used to reset the password
+     *                the password in this case is NOT encrypted, but this should probably
+     *                change if this information is stored on disk... ie a database
+     */
+    public void putNewLoginInfo(String guid, Map info);
+    
+    /**
+     * @param guid    the ID which will be removed from the storage when the info is no longer valid
+     */
+    public void removeNewLoginInfo(String guid);
+        
+}
+

Propchange: portals/jetspeed-2/portal/trunk/jetspeed-api/src/main/java/org/apache/jetspeed/administration/PortalAdministration.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: portals/jetspeed-2/portal/trunk/jetspeed-api/src/main/java/org/apache/jetspeed/administration/PortalAuthenticationConfiguration.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: portals/jetspeed-2/portal/trunk/jetspeed-api/src/main/java/org/apache/jetspeed/administration/PortalConfiguration.java
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: portals/jetspeed-2/portal/trunk/jetspeed-api/src/main/java/org/apache/jetspeed/administration/PortalConfigurationConstants.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/jetspeed-api/src/main/java/org/apache/jetspeed/administration/PortalConfigurationConstants.java?rev=725977&r1=725976&r2=725977&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/jetspeed-api/src/main/java/org/apache/jetspeed/administration/PortalConfigurationConstants.java (original)
+++ portals/jetspeed-2/portal/trunk/jetspeed-api/src/main/java/org/apache/jetspeed/administration/PortalConfigurationConstants.java Fri Dec 12 04:06:29 2008
@@ -1,76 +1,76 @@
-/*
+/*
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
  * this work for additional information regarding copyright ownership.
  * The ASF licenses this file to You under the Apache License, Version 2.0
  * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.jetspeed.administration;
-
-/**
- * PortalConfiguration portal configuration contants
- * TODO: integrate Configuration with JMX 
- * 
- * @author <a href="mailto:taylor@apache.org">David Sean Taylor</a>
- * @version $Id: $
- */
-public interface PortalConfigurationConstants
-{
-    /** EMAIL */
-    /** email of the system administrator */
-    static final String EMAIL_ADMIN = "email.admin";
-    /** email of the system manager */
-    static final String EMAIL_MANAGER = "email.manager";
-    /** email sender */
-    static final String EMAIL_SENDER = "email.sender";
-    /** email user info attribute **/
-    static final String EMAIL_USERINFO_ATTRIBUTE = "email.userinfo.attribute";
-    
-    /** LAYOUT */
-    /** the default page layout if none is specified */
-    static final String LAYOUT_PAGE_DEFAULT = "layout.page.default";
-    
-    /** Decorators */
-    /** default page decorator if none specified */
-    static final String DECORATOR_PAGE_DEFAULT = "decorator.page.default";
-    /** default portlet decorator if none specified */    
-    static final String DECORATOR_PORTLET_DEFAULT = "decorator.portlet.default";
-    
-    /** PSML **/
-    /** default psml page */
-    static final String PSML_PAGE_DEFAULT = "psml.page.default";
-    
-    /** PSML Templates */
-    /** PSML Folder Template to copy during new user creation and registration */
-    static final String PSML_TEMPLATE_FOLDER = "psml.template.folder";
-    
-    /** PROFILER **/
-    static final String PROFILER_RULE_NAMES_DEFAULT = "profiler.rule.names.default";
-    static final String PROFILER_RULE_VALUES_DEFAULT = "profiler.rule.values.default";
-    
-    /** Registration */ 
-    /** Registration default Roles assigned during registration or new user creation **/
-    static final String REGISTRATION_ROLES_DEFAULT = "registration.roles.default";
-    /** Registration default groups assigned during registration or new user creation **/    
-    static final String REGISTRATION_GROUPS_DEFAULT = "registration.groups.default";
-    /** Registration default profiling rules assigned during registration or new user creation **/        
-    static final String REGISTRATION_RULES_DEFAULT = "registration.rules.default";
-    
-    /** Users */
-    static final String USERS_DEFAULT_ADMIN = "default.admin.user";
-    static final String USERS_DEFAULT_GUEST = "default.user.principal";    
-    static final String ROLES_DEFAULT_ADMIN = "default.admin.role";    
-    static final String ROLES_DEFAULT_MANAGER = "default.manager.role";
-    static final String ROLES_DEFAULT_USER = "default.user.role";
-    static final String ROLES_DEFAULT_GUEST = "default.guest.role";
-    
-}
+ * the License.  You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.jetspeed.administration;
+
+/**
+ * PortalConfiguration portal configuration contants
+ * TODO: integrate Configuration with JMX 
+ * 
+ * @author <a href="mailto:taylor@apache.org">David Sean Taylor</a>
+ * @version $Id: $
+ */
+public interface PortalConfigurationConstants
+{
+    /** EMAIL */
+    /** email of the system administrator */
+    static final String EMAIL_ADMIN = "email.admin";
+    /** email of the system manager */
+    static final String EMAIL_MANAGER = "email.manager";
+    /** email sender */
+    static final String EMAIL_SENDER = "email.sender";
+    /** email user info attribute **/
+    static final String EMAIL_USERINFO_ATTRIBUTE = "email.userinfo.attribute";
+    
+    /** LAYOUT */
+    /** the default page layout if none is specified */
+    static final String LAYOUT_PAGE_DEFAULT = "layout.page.default";
+    
+    /** Decorators */
+    /** default page decorator if none specified */
+    static final String DECORATOR_PAGE_DEFAULT = "decorator.page.default";
+    /** default portlet decorator if none specified */    
+    static final String DECORATOR_PORTLET_DEFAULT = "decorator.portlet.default";
+    
+    /** PSML **/
+    /** default psml page */
+    static final String PSML_PAGE_DEFAULT = "psml.page.default";
+    
+    /** PSML Templates */
+    /** PSML Folder Template to copy during new user creation and registration */
+    static final String PSML_TEMPLATE_FOLDER = "psml.template.folder";
+    
+    /** PROFILER **/
+    static final String PROFILER_RULE_NAMES_DEFAULT = "profiler.rule.names.default";
+    static final String PROFILER_RULE_VALUES_DEFAULT = "profiler.rule.values.default";
+    
+    /** Registration */ 
+    /** Registration default Roles assigned during registration or new user creation **/
+    static final String REGISTRATION_ROLES_DEFAULT = "registration.roles.default";
+    /** Registration default groups assigned during registration or new user creation **/    
+    static final String REGISTRATION_GROUPS_DEFAULT = "registration.groups.default";
+    /** Registration default profiling rules assigned during registration or new user creation **/        
+    static final String REGISTRATION_RULES_DEFAULT = "registration.rules.default";
+    
+    /** Users */
+    static final String USERS_DEFAULT_ADMIN = "default.admin.user";
+    static final String USERS_DEFAULT_GUEST = "default.user.principal";    
+    static final String ROLES_DEFAULT_ADMIN = "default.admin.role";    
+    static final String ROLES_DEFAULT_MANAGER = "default.manager.role";
+    static final String ROLES_DEFAULT_USER = "default.user.role";
+    static final String ROLES_DEFAULT_GUEST = "default.guest.role";
+    
+}

Propchange: portals/jetspeed-2/portal/trunk/jetspeed-api/src/main/java/org/apache/jetspeed/administration/PortalConfigurationConstants.java
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: portals/jetspeed-2/portal/trunk/jetspeed-api/src/main/java/org/apache/jetspeed/administration/RegistrationException.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/jetspeed-api/src/main/java/org/apache/jetspeed/administration/RegistrationException.java?rev=725977&r1=725976&r2=725977&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/jetspeed-api/src/main/java/org/apache/jetspeed/administration/RegistrationException.java (original)
+++ portals/jetspeed-2/portal/trunk/jetspeed-api/src/main/java/org/apache/jetspeed/administration/RegistrationException.java Fri Dec 12 04:06:29 2008
@@ -1,59 +1,59 @@
-/*
+/*
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
  * this work for additional information regarding copyright ownership.
  * The ASF licenses this file to You under the Apache License, Version 2.0
  * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.jetspeed.administration;
-
-import org.apache.jetspeed.exception.JetspeedException;
-import org.apache.jetspeed.i18n.KeyedMessage;
-
-/**
- * Registration-related exceptions
- * 
- * @author <a href="mailto:taylor@apache.org">David Sean Taylor</a>
- * @version $Id: $
- */
-public class RegistrationException extends JetspeedException
-{
-    public RegistrationException()
-    {
-        super();
-    }
-
-    public RegistrationException(KeyedMessage keyedMessage, Throwable nested)
-    {
-        super(keyedMessage, nested);
-    }
-
-    public RegistrationException(KeyedMessage typedMessage)
-    {
-        super(typedMessage);
-    }
-
-    public RegistrationException(String msg, Throwable nested)
-    {
-        super(msg, nested);
-    }
-
-    public RegistrationException(String message)
-    {
-        super(message);
-    }
-
-    public RegistrationException(Throwable nested)
-    {
-        super(nested);
-    }
-}
+ * the License.  You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.jetspeed.administration;
+
+import org.apache.jetspeed.exception.JetspeedException;
+import org.apache.jetspeed.i18n.KeyedMessage;
+
+/**
+ * Registration-related exceptions
+ * 
+ * @author <a href="mailto:taylor@apache.org">David Sean Taylor</a>
+ * @version $Id: $
+ */
+public class RegistrationException extends JetspeedException
+{
+    public RegistrationException()
+    {
+        super();
+    }
+
+    public RegistrationException(KeyedMessage keyedMessage, Throwable nested)
+    {
+        super(keyedMessage, nested);
+    }
+
+    public RegistrationException(KeyedMessage typedMessage)
+    {
+        super(typedMessage);
+    }
+
+    public RegistrationException(String msg, Throwable nested)
+    {
+        super(msg, nested);
+    }
+
+    public RegistrationException(String message)
+    {
+        super(message);
+    }
+
+    public RegistrationException(Throwable nested)
+    {
+        super(nested);
+    }
+}

Propchange: portals/jetspeed-2/portal/trunk/jetspeed-api/src/main/java/org/apache/jetspeed/administration/RegistrationException.java
------------------------------------------------------------------------------
    svn:eol-style = native



---------------------------------------------------------------------
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