You are viewing a plain text version of this content. The canonical link for it is here.
Posted to nuvem-commits@incubator.apache.org by lr...@apache.org on 2010/09/17 06:50:49 UTC
svn commit: r997998 - in /incubator/nuvem/trunk: store-appengine-webapp/war/
store-appengine-webapp/war/WEB-INF/
store-catalog-appengine-webapp/war/WEB-INF/
store-merger-appengine-webapp/war/
Author: lresende
Date: Fri Sep 17 06:50:48 2010
New Revision: 997998
URL: http://svn.apache.org/viewvc?rev=997998&view=rev
Log:
Fixing up Apache License headers and other minor updates to confguration files
Removed:
incubator/nuvem/trunk/store-appengine-webapp/war/log4j.properties
incubator/nuvem/trunk/store-merger-appengine-webapp/war/log4j.properties
Modified:
incubator/nuvem/trunk/store-appengine-webapp/war/WEB-INF/logging.properties
incubator/nuvem/trunk/store-appengine-webapp/war/WEB-INF/web.xml
incubator/nuvem/trunk/store-catalog-appengine-webapp/war/WEB-INF/appengine-web.xml
incubator/nuvem/trunk/store-catalog-appengine-webapp/war/WEB-INF/logging.properties
incubator/nuvem/trunk/store-catalog-appengine-webapp/war/WEB-INF/web.xml
Modified: incubator/nuvem/trunk/store-appengine-webapp/war/WEB-INF/logging.properties
URL: http://svn.apache.org/viewvc/incubator/nuvem/trunk/store-appengine-webapp/war/WEB-INF/logging.properties?rev=997998&r1=997997&r2=997998&view=diff
==============================================================================
--- incubator/nuvem/trunk/store-appengine-webapp/war/WEB-INF/logging.properties (original)
+++ incubator/nuvem/trunk/store-appengine-webapp/war/WEB-INF/logging.properties Fri Sep 17 06:50:48 2010
@@ -23,7 +23,7 @@
#
# To use this configuration, copy it into your application's WEB-INF
# folder and add the following to your appengine-web.xml:
-#
+#
# <system-properties>
# <property name="java.util.logging.config.file" value="WEB-INF/logging.properties"/>
# </system-properties>
Modified: incubator/nuvem/trunk/store-appengine-webapp/war/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/incubator/nuvem/trunk/store-appengine-webapp/war/WEB-INF/web.xml?rev=997998&r1=997997&r2=997998&view=diff
==============================================================================
--- incubator/nuvem/trunk/store-appengine-webapp/war/WEB-INF/web.xml (original)
+++ incubator/nuvem/trunk/store-appengine-webapp/war/WEB-INF/web.xml Fri Sep 17 06:50:48 2010
@@ -7,21 +7,22 @@
* 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.
+ * under the License.
-->
-<!DOCTYPE web-app
- PUBLIC "-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN"
- "http://java.sun.com/dtd/web-app_2_3.dtd">
-<web-app>
+<web-app xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+xmlns="http://java.sun.com/xml/ns/javaee"
+xmlns:web="http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd"
+xsi:schemaLocation="http://java.sun.com/xml/ns/javaee
+http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd" version="2.5">
<!-- Tuscany Filter -->
<filter>
Modified: incubator/nuvem/trunk/store-catalog-appengine-webapp/war/WEB-INF/appengine-web.xml
URL: http://svn.apache.org/viewvc/incubator/nuvem/trunk/store-catalog-appengine-webapp/war/WEB-INF/appengine-web.xml?rev=997998&r1=997997&r2=997998&view=diff
==============================================================================
--- incubator/nuvem/trunk/store-catalog-appengine-webapp/war/WEB-INF/appengine-web.xml (original)
+++ incubator/nuvem/trunk/store-catalog-appengine-webapp/war/WEB-INF/appengine-web.xml Fri Sep 17 06:50:48 2010
@@ -1,11 +1,29 @@
<?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.
+-->
<appengine-web-app xmlns="http://appengine.google.com/ns/1.0">
<application>tuscany-store-catalog</application>
<version>4</version>
-
+
<!-- Configure java.util.logging -->
<system-properties>
<property name="java.util.logging.config.file" value="WEB-INF/logging.properties"/>
</system-properties>
-
+
</appengine-web-app>
\ No newline at end of file
Modified: incubator/nuvem/trunk/store-catalog-appengine-webapp/war/WEB-INF/logging.properties
URL: http://svn.apache.org/viewvc/incubator/nuvem/trunk/store-catalog-appengine-webapp/war/WEB-INF/logging.properties?rev=997998&r1=997997&r2=997998&view=diff
==============================================================================
--- incubator/nuvem/trunk/store-catalog-appengine-webapp/war/WEB-INF/logging.properties (original)
+++ incubator/nuvem/trunk/store-catalog-appengine-webapp/war/WEB-INF/logging.properties Fri Sep 17 06:50:48 2010
@@ -1,9 +1,29 @@
+#
+#
+# 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.
+#
+#
# A default java.util.logging configuration.
# (All App Engine logging is through java.util.logging by default).
#
# To use this configuration, copy it into your application's WEB-INF
# folder and add the following to your appengine-web.xml:
-#
+#
# <system-properties>
# <property name="java.util.logging.config.file" value="WEB-INF/logging.properties"/>
# </system-properties>
Modified: incubator/nuvem/trunk/store-catalog-appengine-webapp/war/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/incubator/nuvem/trunk/store-catalog-appengine-webapp/war/WEB-INF/web.xml?rev=997998&r1=997997&r2=997998&view=diff
==============================================================================
--- incubator/nuvem/trunk/store-catalog-appengine-webapp/war/WEB-INF/web.xml (original)
+++ incubator/nuvem/trunk/store-catalog-appengine-webapp/war/WEB-INF/web.xml Fri Sep 17 06:50:48 2010
@@ -1,9 +1,27 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE web-app
- PUBLIC "-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN"
- "http://java.sun.com/dtd/web-app_2_3.dtd">
-
-<web-app>
+<!--
+ * 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.
+-->
+<web-app xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+xmlns="http://java.sun.com/xml/ns/javaee"
+xmlns:web="http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd"
+xsi:schemaLocation="http://java.sun.com/xml/ns/javaee
+http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd" version="2.5">
<!-- Tuscany Filter -->
<filter>