You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@empire-db.apache.org by re...@apache.org on 2008/08/21 12:16:06 UTC

svn commit: r687689 - in /incubator/empire-db/trunk/struts2-ext/DBWebSample: ./ WebRoot/META-INF/ WebRoot/WEB-INF/ WebRoot/css/ WebRoot/jsp/ src/

Author: reiher
Date: Thu Aug 21 03:16:04 2008
New Revision: 687689

URL: http://svn.apache.org/viewvc?rev=687689&view=rev
Log:
- Added Apache license headers
- Ant: manifest.mf, the licenses, notice and such txt to META-INF, copy README
- Removed ESTEAM occurrences
- The manifest.mf adaption
- Updated hsqldb.jar to the latest release 1.8.0.10 and added version suffix to jar name

Modified:
    incubator/empire-db/trunk/struts2-ext/DBWebSample/.tomcatplugin
    incubator/empire-db/trunk/struts2-ext/DBWebSample/WebRoot/META-INF/MANIFEST.MF
    incubator/empire-db/trunk/struts2-ext/DBWebSample/WebRoot/WEB-INF/config.xml
    incubator/empire-db/trunk/struts2-ext/DBWebSample/WebRoot/WEB-INF/empire-tags.tld
    incubator/empire-db/trunk/struts2-ext/DBWebSample/WebRoot/css/main.css
    incubator/empire-db/trunk/struts2-ext/DBWebSample/WebRoot/jsp/employeeDetails.jsp
    incubator/empire-db/trunk/struts2-ext/DBWebSample/WebRoot/jsp/employeeList.jsp
    incubator/empire-db/trunk/struts2-ext/DBWebSample/WebRoot/jsp/employeeSearch.jsp
    incubator/empire-db/trunk/struts2-ext/DBWebSample/WebRoot/jsp/error.jsp
    incubator/empire-db/trunk/struts2-ext/DBWebSample/WebRoot/jsp/login.jsp
    incubator/empire-db/trunk/struts2-ext/DBWebSample/classpath_delivery-version
    incubator/empire-db/trunk/struts2-ext/DBWebSample/src/messages_de.properties
    incubator/empire-db/trunk/struts2-ext/DBWebSample/src/messages_en.properties
    incubator/empire-db/trunk/struts2-ext/DBWebSample/src/struts.properties
    incubator/empire-db/trunk/struts2-ext/DBWebSample/src/struts.xml
    incubator/empire-db/trunk/struts2-ext/DBWebSample/tomcatplugin_delivery-version

Modified: incubator/empire-db/trunk/struts2-ext/DBWebSample/.tomcatplugin
URL: http://svn.apache.org/viewvc/incubator/empire-db/trunk/struts2-ext/DBWebSample/.tomcatplugin?rev=687689&r1=687688&r2=687689&view=diff
==============================================================================
--- incubator/empire-db/trunk/struts2-ext/DBWebSample/.tomcatplugin (original)
+++ incubator/empire-db/trunk/struts2-ext/DBWebSample/.tomcatplugin Thu Aug 21 03:16:04 2008
@@ -16,7 +16,7 @@
         <webClassPathEntry>/Empire-db/lib/commons-logging-1.0.4.jar</webClassPathEntry>
         <webClassPathEntry>/Empire-db/lib/log4j-1.2.14.jar</webClassPathEntry>
         <webClassPathEntry>/Empire-struts2-ext/bin</webClassPathEntry>
-        <webClassPathEntry>/JDBCDrivers/lib/hsqldb.jar</webClassPathEntry>
+        <webClassPathEntry>/JDBCDrivers/lib/hsqldb-1.8.0.10.jar</webClassPathEntry>
         <webClassPathEntry>/Struts2.0.11/lib/commons-collections-3.2.1.jar</webClassPathEntry>
         <webClassPathEntry>/Struts2.0.11/lib/commons-digester-1.8.jar</webClassPathEntry>
         <webClassPathEntry>/Struts2.0.11/lib/commons-fileupload-1.2.1.jar</webClassPathEntry>

Modified: incubator/empire-db/trunk/struts2-ext/DBWebSample/WebRoot/META-INF/MANIFEST.MF
URL: http://svn.apache.org/viewvc/incubator/empire-db/trunk/struts2-ext/DBWebSample/WebRoot/META-INF/MANIFEST.MF?rev=687689&r1=687688&r2=687689&view=diff
==============================================================================
--- incubator/empire-db/trunk/struts2-ext/DBWebSample/WebRoot/META-INF/MANIFEST.MF (original)
+++ incubator/empire-db/trunk/struts2-ext/DBWebSample/WebRoot/META-INF/MANIFEST.MF Thu Aug 21 03:16:04 2008
@@ -1,3 +1,9 @@
 Manifest-Version: 1.0
-Class-Path: 
-
+Extension-Name: org.apache.empire.struts2.websample
+Specification-Title: Apache Empire-Struts2-Extension web example
+Specification-Vendor: The Apache Software Foundation
+Specification-Version: 1.0
+Implementation-Vendor-Id: org.apache
+Implementation-Title: org.apache.empire.struts2.websample
+Implementation-Vendor: The Apache Software Foundation
+Implementation-Version: 1.0

Modified: incubator/empire-db/trunk/struts2-ext/DBWebSample/WebRoot/WEB-INF/config.xml
URL: http://svn.apache.org/viewvc/incubator/empire-db/trunk/struts2-ext/DBWebSample/WebRoot/WEB-INF/config.xml?rev=687689&r1=687688&r2=687689&view=diff
==============================================================================
--- incubator/empire-db/trunk/struts2-ext/DBWebSample/WebRoot/WEB-INF/config.xml (original)
+++ incubator/empire-db/trunk/struts2-ext/DBWebSample/WebRoot/WEB-INF/config.xml Thu Aug 21 03:16:04 2008
@@ -42,7 +42,7 @@
 		<jdbcClass>com.mysql.jdbc.Driver</jdbcClass>
 		<jdbcURL>jdbc:mysql://localhost</jdbcURL>
 		<jdbcUser>root</jdbcUser>
-		<jdbcPwd>esteam</jdbcPwd>
+		<jdbcPwd>empire-db</jdbcPwd>
 		<schemaName>DBSAMPLE</schemaName>
 	</properties-mysql>
 
@@ -62,7 +62,7 @@
 		<jdbcClass>com.microsoft.sqlserver.jdbc.SQLServerDriver</jdbcClass>
 		<jdbcURL>jdbc:sqlserver://192.168.0.2:1433</jdbcURL>
 		<jdbcUser>sa</jdbcUser>
-		<jdbcPwd>esteam</jdbcPwd>
+		<jdbcPwd>empire-db</jdbcPwd>
 		<schemaName>DBSAMPLE</schemaName>
 	</properties-sqlserver>
 	

Modified: incubator/empire-db/trunk/struts2-ext/DBWebSample/WebRoot/WEB-INF/empire-tags.tld
URL: http://svn.apache.org/viewvc/incubator/empire-db/trunk/struts2-ext/DBWebSample/WebRoot/WEB-INF/empire-tags.tld?rev=687689&r1=687688&r2=687689&view=diff
==============================================================================
--- incubator/empire-db/trunk/struts2-ext/DBWebSample/WebRoot/WEB-INF/empire-tags.tld (original)
+++ incubator/empire-db/trunk/struts2-ext/DBWebSample/WebRoot/WEB-INF/empire-tags.tld Thu Aug 21 03:16:04 2008
@@ -1,4 +1,24 @@
 <?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.
+ */
+ --> 
 <taglib xmlns="http://java.sun.com/xml/ns/j2ee" 
   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
   xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-jsptaglibrary_2_0.xsd" 

Modified: incubator/empire-db/trunk/struts2-ext/DBWebSample/WebRoot/css/main.css
URL: http://svn.apache.org/viewvc/incubator/empire-db/trunk/struts2-ext/DBWebSample/WebRoot/css/main.css?rev=687689&r1=687688&r2=687689&view=diff
==============================================================================
--- incubator/empire-db/trunk/struts2-ext/DBWebSample/WebRoot/css/main.css (original)
+++ incubator/empire-db/trunk/struts2-ext/DBWebSample/WebRoot/css/main.css Thu Aug 21 03:16:04 2008
@@ -1,3 +1,21 @@
+/*
+ * 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.
+ */
 html, body  {
     margin-left: 10px;
     margin-right: 10px;

Modified: incubator/empire-db/trunk/struts2-ext/DBWebSample/WebRoot/jsp/employeeDetails.jsp
URL: http://svn.apache.org/viewvc/incubator/empire-db/trunk/struts2-ext/DBWebSample/WebRoot/jsp/employeeDetails.jsp?rev=687689&r1=687688&r2=687689&view=diff
==============================================================================
--- incubator/empire-db/trunk/struts2-ext/DBWebSample/WebRoot/jsp/employeeDetails.jsp (original)
+++ incubator/empire-db/trunk/struts2-ext/DBWebSample/WebRoot/jsp/employeeDetails.jsp Thu Aug 21 03:16:04 2008
@@ -1,3 +1,23 @@
+<!-- 
+/*
+ * 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.
+ */
+ --> 
 <%@ page contentType="text/html;charset=UTF-8" language="java" import="org.apache.empire.struts2.websample.db.*"%>
 <%@ taglib prefix="e" uri="/empire-tags" %>
 <jsp:useBean id="db" scope="application" type="org.apache.empire.struts2.websample.db.SampleDB"/>

Modified: incubator/empire-db/trunk/struts2-ext/DBWebSample/WebRoot/jsp/employeeList.jsp
URL: http://svn.apache.org/viewvc/incubator/empire-db/trunk/struts2-ext/DBWebSample/WebRoot/jsp/employeeList.jsp?rev=687689&r1=687688&r2=687689&view=diff
==============================================================================
--- incubator/empire-db/trunk/struts2-ext/DBWebSample/WebRoot/jsp/employeeList.jsp (original)
+++ incubator/empire-db/trunk/struts2-ext/DBWebSample/WebRoot/jsp/employeeList.jsp Thu Aug 21 03:16:04 2008
@@ -1,3 +1,23 @@
+<!-- 
+/*
+ * 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.
+ */
+ --> 
 <%@ page contentType="text/html;charset=UTF-8" language="java" import="org.apache.empire.struts2.websample.db.*" %>
 <%@ taglib prefix="e" uri="/empire-tags" %>
 <jsp:useBean id="db" scope="application" type="org.apache.empire.struts2.websample.db.SampleDB"/>

Modified: incubator/empire-db/trunk/struts2-ext/DBWebSample/WebRoot/jsp/employeeSearch.jsp
URL: http://svn.apache.org/viewvc/incubator/empire-db/trunk/struts2-ext/DBWebSample/WebRoot/jsp/employeeSearch.jsp?rev=687689&r1=687688&r2=687689&view=diff
==============================================================================
--- incubator/empire-db/trunk/struts2-ext/DBWebSample/WebRoot/jsp/employeeSearch.jsp (original)
+++ incubator/empire-db/trunk/struts2-ext/DBWebSample/WebRoot/jsp/employeeSearch.jsp Thu Aug 21 03:16:04 2008
@@ -1,3 +1,23 @@
+<!-- 
+/*
+ * 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.
+ */
+ --> 
 <%@ page contentType="text/html;charset=UTF-8" language="java" import="org.apache.empire.struts2.websample.db.*"%>
 <%@ taglib prefix="e" uri="/empire-tags" %>
 <jsp:useBean id="db" scope="application" type="org.apache.empire.struts2.websample.db.SampleDB"/>

Modified: incubator/empire-db/trunk/struts2-ext/DBWebSample/WebRoot/jsp/error.jsp
URL: http://svn.apache.org/viewvc/incubator/empire-db/trunk/struts2-ext/DBWebSample/WebRoot/jsp/error.jsp?rev=687689&r1=687688&r2=687689&view=diff
==============================================================================
--- incubator/empire-db/trunk/struts2-ext/DBWebSample/WebRoot/jsp/error.jsp (original)
+++ incubator/empire-db/trunk/struts2-ext/DBWebSample/WebRoot/jsp/error.jsp Thu Aug 21 03:16:04 2008
@@ -1,3 +1,23 @@
+<!-- 
+/*
+ * 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.
+ */
+ --> 
 <%@ page contentType="text/html;charset=UTF-8" language="java" %>
 <%@ taglib prefix="s" uri="/struts-tags" %>
 <%@ taglib prefix="e" uri="/empire-tags" %>

Modified: incubator/empire-db/trunk/struts2-ext/DBWebSample/WebRoot/jsp/login.jsp
URL: http://svn.apache.org/viewvc/incubator/empire-db/trunk/struts2-ext/DBWebSample/WebRoot/jsp/login.jsp?rev=687689&r1=687688&r2=687689&view=diff
==============================================================================
--- incubator/empire-db/trunk/struts2-ext/DBWebSample/WebRoot/jsp/login.jsp (original)
+++ incubator/empire-db/trunk/struts2-ext/DBWebSample/WebRoot/jsp/login.jsp Thu Aug 21 03:16:04 2008
@@ -1,3 +1,23 @@
+<!-- 
+/*
+ * 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.
+ */
+ --> 
 <%@ page contentType="text/html;charset=UTF-8" language="java" %>
 <%@ taglib prefix="s" uri="/struts-tags" %>
 <%@ taglib prefix="e" uri="/empire-tags" %>

Modified: incubator/empire-db/trunk/struts2-ext/DBWebSample/classpath_delivery-version
URL: http://svn.apache.org/viewvc/incubator/empire-db/trunk/struts2-ext/DBWebSample/classpath_delivery-version?rev=687689&r1=687688&r2=687689&view=diff
==============================================================================
--- incubator/empire-db/trunk/struts2-ext/DBWebSample/classpath_delivery-version (original)
+++ incubator/empire-db/trunk/struts2-ext/DBWebSample/classpath_delivery-version Thu Aug 21 03:16:04 2008
@@ -13,6 +13,6 @@
 	<classpathentry kind="lib" path="WebRoot/WEB-INF/lib/xwork-2.0.5.jar"/>
 	<classpathentry kind="lib" path="WebRoot/WEB-INF/lib/struts2-core-2.0.11.2.jar"/>
 	<classpathentry kind="lib" path="WebRoot/WEB-INF/lib/ognl-2.6.11.jar"/>
-	<classpathentry kind="lib" path="WebRoot/WEB-INF/lib/hsqldb.jar"/>
+	<classpathentry kind="lib" path="WebRoot/WEB-INF/lib/hsqldb-1.8.0.10.jar"/>
 	<classpathentry kind="output" path="build/classes"/>
 </classpath>

Modified: incubator/empire-db/trunk/struts2-ext/DBWebSample/src/messages_de.properties
URL: http://svn.apache.org/viewvc/incubator/empire-db/trunk/struts2-ext/DBWebSample/src/messages_de.properties?rev=687689&r1=687688&r2=687689&view=diff
==============================================================================
--- incubator/empire-db/trunk/struts2-ext/DBWebSample/src/messages_de.properties (original)
+++ incubator/empire-db/trunk/struts2-ext/DBWebSample/src/messages_de.properties Thu Aug 21 03:16:04 2008
@@ -1,3 +1,21 @@
+#/*
+# * 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.
+# */
 
 #fields
 field.title.employees.employeeId=Mitarbeiter Nr.

Modified: incubator/empire-db/trunk/struts2-ext/DBWebSample/src/messages_en.properties
URL: http://svn.apache.org/viewvc/incubator/empire-db/trunk/struts2-ext/DBWebSample/src/messages_en.properties?rev=687689&r1=687688&r2=687689&view=diff
==============================================================================
--- incubator/empire-db/trunk/struts2-ext/DBWebSample/src/messages_en.properties (original)
+++ incubator/empire-db/trunk/struts2-ext/DBWebSample/src/messages_en.properties Thu Aug 21 03:16:04 2008
@@ -1,3 +1,21 @@
+#/*
+# * 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.
+# */
 
 #fields
 field.title.employees.employeeId=Employee ID

Modified: incubator/empire-db/trunk/struts2-ext/DBWebSample/src/struts.properties
URL: http://svn.apache.org/viewvc/incubator/empire-db/trunk/struts2-ext/DBWebSample/src/struts.properties?rev=687689&r1=687688&r2=687689&view=diff
==============================================================================
--- incubator/empire-db/trunk/struts2-ext/DBWebSample/src/struts.properties (original)
+++ incubator/empire-db/trunk/struts2-ext/DBWebSample/src/struts.properties Thu Aug 21 03:16:04 2008
@@ -1,2 +1,20 @@
+#/*
+# * 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.
+# */
 struts.custom.i18n.resources=messages
 struts.devMode=true

Modified: incubator/empire-db/trunk/struts2-ext/DBWebSample/src/struts.xml
URL: http://svn.apache.org/viewvc/incubator/empire-db/trunk/struts2-ext/DBWebSample/src/struts.xml?rev=687689&r1=687688&r2=687689&view=diff
==============================================================================
--- incubator/empire-db/trunk/struts2-ext/DBWebSample/src/struts.xml (original)
+++ incubator/empire-db/trunk/struts2-ext/DBWebSample/src/struts.xml Thu Aug 21 03:16:04 2008
@@ -33,12 +33,12 @@
 	<package name="sample" namespace="" extends="struts-default">
 
         <interceptors>
-			<!-- esteam Interceptors -->
+			<!-- org.apache.empire.struts2 Interceptors -->
 	        <interceptor name="actionBasics" class="org.apache.empire.struts2.interceptors.ActionBasicsInterceptor" >
 	        	<param name="errorAction">login!doError</param>
 	        </interceptor>
 
-			<!-- esteam Interceptors -->
+			<!-- org.apache.empire.struts2 Interceptors -->
 	        <interceptor name="actionAccess" class="org.apache.empire.struts2.interceptors.ActionAccessInterceptor" >
 	        	<param name="loginAction">login!doInit</param>
 	        	<param name="accessDeniedAction">login!doInit</param>

Modified: incubator/empire-db/trunk/struts2-ext/DBWebSample/tomcatplugin_delivery-version
URL: http://svn.apache.org/viewvc/incubator/empire-db/trunk/struts2-ext/DBWebSample/tomcatplugin_delivery-version?rev=687689&r1=687688&r2=687689&view=diff
==============================================================================
--- incubator/empire-db/trunk/struts2-ext/DBWebSample/tomcatplugin_delivery-version (original)
+++ incubator/empire-db/trunk/struts2-ext/DBWebSample/tomcatplugin_delivery-version Thu Aug 21 03:16:04 2008
@@ -14,7 +14,7 @@
         <webClassPathEntry>/DBWebSample/WebRoot/WEB-INF/lib/commons-beanutils-1.7.0.jar</webClassPathEntry>
         <webClassPathEntry>/DBWebSample/WebRoot/WEB-INF/lib/commons-collections-3.2.1.jar</webClassPathEntry>
         <webClassPathEntry>/DBWebSample/WebRoot/WEB-INF/lib/commons-logging-1.0.4.jar</webClassPathEntry>
-        <webClassPathEntry>/DBWebSample/WebRoot/WEB-INF/lib/hsqldb.jar</webClassPathEntry>
+        <webClassPathEntry>/DBWebSample/WebRoot/WEB-INF/lib/hsqldb-1.8.0.10.jar</webClassPathEntry>
         <webClassPathEntry>/DBWebSample/WebRoot/WEB-INF/lib/log4j-1.2.14.jar</webClassPathEntry>
         <webClassPathEntry>/DBWebSample/WebRoot/WEB-INF/lib/ognl-2.6.11.jar</webClassPathEntry>
         <webClassPathEntry>/DBWebSample/WebRoot/WEB-INF/lib/struts2-core-2.0.11.2.jar</webClassPathEntry>