Author: vsiveton
Date: Tue Mar 10 10:36:09 2009
New Revision: 752045
URL: http://svn.apache.org/viewvc?rev=752045&view=rev
Log:
o merged r752043 (added license header)
Modified:
incubator/shindig/branches/1.0.x-incubating/java/samples/src/main/resources/META-INF/orm.xml
incubator/shindig/branches/1.0.x-incubating/java/samples/src/main/resources/META-INF/persistence.xml
incubator/shindig/branches/1.0.x-incubating/java/samples/src/main/resources/socialjpa.properties
incubator/shindig/branches/1.0.x-incubating/java/samples/src/test/resources/log4j.properties
Modified:
incubator/shindig/branches/1.0.x-incubating/java/samples/src/main/resources/META-INF/orm.xml
URL:
http://svn.apache.org/viewvc/incubator/shindig/branches/1.0.x-incubating/java/samples/src/main/resources/META-INF/orm.xml?rev=752045&r1=752044&r2=752045&view=diff
==============================================================================
---
incubator/shindig/branches/1.0.x-incubating/java/samples/src/main/resources/META-INF/orm.xml
(original)
+++
incubator/shindig/branches/1.0.x-incubating/java/samples/src/main/resources/META-INF/orm.xml
Tue Mar 10 10:36:09 2009
@@ -1,4 +1,22 @@
<?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.
+-->
<entity-mappings xmlns="http://java.sun.com/xml/ns/persistence/orm";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xsi:schemaLocation="http://java.sun.com/xml/ns/persistence/orm
http://java.sun.com/xml/ns/persistence/orm_1_0.xsd";
Modified:
incubator/shindig/branches/1.0.x-incubating/java/samples/src/main/resources/META-INF/persistence.xml
URL:
http://svn.apache.org/viewvc/incubator/shindig/branches/1.0.x-incubating/java/samples/src/main/resources/META-INF/persistence.xml?rev=752045&r1=752044&r2=752045&view=diff
==============================================================================
---
incubator/shindig/branches/1.0.x-incubating/java/samples/src/main/resources/META-INF/persistence.xml
(original)
+++
incubator/shindig/branches/1.0.x-incubating/java/samples/src/main/resources/META-INF/persistence.xml
Tue Mar 10 10:36:09 2009
@@ -1,4 +1,22 @@
<?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.
+-->
<persistence version="1.0"
xmlns="http://java.sun.com/xml/ns/persistence";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
Modified:
incubator/shindig/branches/1.0.x-incubating/java/samples/src/main/resources/socialjpa.properties
URL:
http://svn.apache.org/viewvc/incubator/shindig/branches/1.0.x-incubating/java/samples/src/main/resources/socialjpa.properties?rev=752045&r1=752044&r2=752045&view=diff
==============================================================================
---
incubator/shindig/branches/1.0.x-incubating/java/samples/src/main/resources/socialjpa.properties
(original)
+++
incubator/shindig/branches/1.0.x-incubating/java/samples/src/main/resources/socialjpa.properties
Tue Mar 10 10:36:09 2009
@@ -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.
+
db.driver=org.apache.derby.jdbc.EmbeddedDriver
db.url=jdbc:derby:target/testdb;create=true
db.user=sa
Modified:
incubator/shindig/branches/1.0.x-incubating/java/samples/src/test/resources/log4j.properties
URL:
http://svn.apache.org/viewvc/incubator/shindig/branches/1.0.x-incubating/java/samples/src/test/resources/log4j.properties?rev=752045&r1=752044&r2=752045&view=diff
==============================================================================
---
incubator/shindig/branches/1.0.x-incubating/java/samples/src/test/resources/log4j.properties
(original)
+++
incubator/shindig/branches/1.0.x-incubating/java/samples/src/test/resources/log4j.properties
Tue Mar 10 10:36:09 2009
@@ -1,7 +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.
+
log4j.rootCategory=info
log4j.rootLogger=info, stdout
-
log4j.appender.stdout=org.apache.log4j.ConsoleAppender
log4j.appender.stdout.layout=org.apache.log4j.PatternLayout
log4j.appender.stdout.layout.ConversionPattern= %p %m [%d] (%F:%L) %n
