You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@aries.apache.org by hu...@apache.org on 2010/04/07 16:06:17 UTC
svn commit: r931557 - in /incubator/aries/trunk/samples:
helloworld-samples/blueprint/blueprint-helloworld-assembly/src/main/filtered-resources/configuration/
transaction-sample/transaction-assembly/src/main/resources/
transaction-sample/transaction-as...
Author: hughesj
Date: Wed Apr 7 14:06:17 2010
New Revision: 931557
URL: http://svn.apache.org/viewvc?rev=931557&view=rev
Log:
ARIES-267 keep RAT happy
Modified:
incubator/aries/trunk/samples/helloworld-samples/blueprint/blueprint-helloworld-assembly/src/main/filtered-resources/configuration/config.ini
incubator/aries/trunk/samples/transaction-sample/transaction-assembly/src/main/resources/configuration/config.ini
incubator/aries/trunk/samples/transaction-sample/transaction-assembly/src/main/resources/txDemoDB.sql
incubator/aries/trunk/samples/transaction-sample/transaction-sample-web/src/main/java/org/apache/aries/samples/transaction/GenericJTAException.java
incubator/aries/trunk/samples/transaction-sample/transaction-sample-web/src/main/resources/WEB-INF/tableTemplate.css
incubator/aries/trunk/samples/transaction-sample/transaction-sample-web/src/main/resources/WEB-INF/web.xml
Modified: incubator/aries/trunk/samples/helloworld-samples/blueprint/blueprint-helloworld-assembly/src/main/filtered-resources/configuration/config.ini
URL: http://svn.apache.org/viewvc/incubator/aries/trunk/samples/helloworld-samples/blueprint/blueprint-helloworld-assembly/src/main/filtered-resources/configuration/config.ini?rev=931557&r1=931556&r2=931557&view=diff
==============================================================================
--- incubator/aries/trunk/samples/helloworld-samples/blueprint/blueprint-helloworld-assembly/src/main/filtered-resources/configuration/config.ini (original)
+++ incubator/aries/trunk/samples/helloworld-samples/blueprint/blueprint-helloworld-assembly/src/main/filtered-resources/configuration/config.ini Wed Apr 7 14:06:17 2010
@@ -1,3 +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.
+
osgi.bundles=\
cm-3.2.0-v20070116@start,\
services-3.1.200-v20070605@start,\
Modified: incubator/aries/trunk/samples/transaction-sample/transaction-assembly/src/main/resources/configuration/config.ini
URL: http://svn.apache.org/viewvc/incubator/aries/trunk/samples/transaction-sample/transaction-assembly/src/main/resources/configuration/config.ini?rev=931557&r1=931556&r2=931557&view=diff
==============================================================================
--- incubator/aries/trunk/samples/transaction-sample/transaction-assembly/src/main/resources/configuration/config.ini (original)
+++ incubator/aries/trunk/samples/transaction-sample/transaction-assembly/src/main/resources/configuration/config.ini Wed Apr 7 14:06:17 2010
@@ -1,2 +1,19 @@
+# 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.
+
osgi.bundles=cm-3.2.0-v20070116.jar@start,services-3.1.200-v20070605.jar@start,pax-logging-api-1.4.jar@start,pax-logging-service-1.4.jar@start,pax-web-jetty-bundle-0.7.2.jar@start,pax-web-extender-war-0.7.2.jar@start,pax-web-jsp-0.7.2.jar@start,osgi-jdbc-derby-1.0.0.jar@start,osgi-jdbc-api-1.0.0.jar@start,org.apache.aries.transaction-1.0.0-incubating-SNAPSHOT.jar@start,transaction-sample-web-1.0.0.jar@start
-eclipse.ignoreApp=true
\ No newline at end of file
+eclipse.ignoreApp=true
Modified: incubator/aries/trunk/samples/transaction-sample/transaction-assembly/src/main/resources/txDemoDB.sql
URL: http://svn.apache.org/viewvc/incubator/aries/trunk/samples/transaction-sample/transaction-assembly/src/main/resources/txDemoDB.sql?rev=931557&r1=931556&r2=931557&view=diff
==============================================================================
--- incubator/aries/trunk/samples/transaction-sample/transaction-assembly/src/main/resources/txDemoDB.sql (original)
+++ incubator/aries/trunk/samples/transaction-sample/transaction-assembly/src/main/resources/txDemoDB.sql Wed Apr 7 14:06:17 2010
@@ -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.
+ */
connect 'jdbc:derby:txDemo;create=true';
CREATE TABLE txDemo (value VARCHAR(40) NOT NULL);
exit;
Modified: incubator/aries/trunk/samples/transaction-sample/transaction-sample-web/src/main/java/org/apache/aries/samples/transaction/GenericJTAException.java
URL: http://svn.apache.org/viewvc/incubator/aries/trunk/samples/transaction-sample/transaction-sample-web/src/main/java/org/apache/aries/samples/transaction/GenericJTAException.java?rev=931557&r1=931556&r2=931557&view=diff
==============================================================================
--- incubator/aries/trunk/samples/transaction-sample/transaction-sample-web/src/main/java/org/apache/aries/samples/transaction/GenericJTAException.java (original)
+++ incubator/aries/trunk/samples/transaction-sample/transaction-sample-web/src/main/java/org/apache/aries/samples/transaction/GenericJTAException.java Wed Apr 7 14:06:17 2010
@@ -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.
+ */
package org.apache.aries.samples.transaction;
import javax.transaction.RollbackException;
Modified: incubator/aries/trunk/samples/transaction-sample/transaction-sample-web/src/main/resources/WEB-INF/tableTemplate.css
URL: http://svn.apache.org/viewvc/incubator/aries/trunk/samples/transaction-sample/transaction-sample-web/src/main/resources/WEB-INF/tableTemplate.css?rev=931557&r1=931556&r2=931557&view=diff
==============================================================================
--- incubator/aries/trunk/samples/transaction-sample/transaction-sample-web/src/main/resources/WEB-INF/tableTemplate.css (original)
+++ incubator/aries/trunk/samples/transaction-sample/transaction-sample-web/src/main/resources/WEB-INF/tableTemplate.css Wed Apr 7 14:06:17 2010
@@ -1,7 +1,25 @@
+/**
+ * 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.
+ */
table {
background-color:#FFF; width:80%; border-collapse:collapse;
}
td {
background-color:#FFF; border:1px solid black; padding:5px;
-}
\ No newline at end of file
+}
Modified: incubator/aries/trunk/samples/transaction-sample/transaction-sample-web/src/main/resources/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/incubator/aries/trunk/samples/transaction-sample/transaction-sample-web/src/main/resources/WEB-INF/web.xml?rev=931557&r1=931556&r2=931557&view=diff
==============================================================================
--- incubator/aries/trunk/samples/transaction-sample/transaction-sample-web/src/main/resources/WEB-INF/web.xml (original)
+++ incubator/aries/trunk/samples/transaction-sample/transaction-sample-web/src/main/resources/WEB-INF/web.xml Wed Apr 7 14:06:17 2010
@@ -1,7 +1,24 @@
<!DOCTYPE web-app PUBLIC
"-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN"
"http://java.sun.com/dtd/web-app_2_3.dtd" >
+<!--
+ 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>
<display-name>OSGi Transaction sample Web Application</display-name>
<servlet>