You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by jb...@apache.org on 2008/05/14 20:16:47 UTC
svn commit: r656346 - in /geronimo/samples/trunk/samples:
CustomerService/CustomerService-ear/src/main/resources/
async-http/http-local-app/src/main/webapp/WEB-INF/
async-http/http-remote-app/src/main/java/org/apache/geronimo/
async-http/http-remote-ap...
Author: jbohn
Date: Wed May 14 11:16:47 2008
New Revision: 656346
URL: http://svn.apache.org/viewvc?rev=656346&view=rev
Log:
merge r656345 from branches/2.1 - add missing license header to some files
Modified:
geronimo/samples/trunk/samples/CustomerService/CustomerService-ear/src/main/resources/CustomerService.sql
geronimo/samples/trunk/samples/async-http/http-local-app/src/main/webapp/WEB-INF/web.xml
geronimo/samples/trunk/samples/async-http/http-remote-app/src/main/java/org/apache/geronimo/PageServlet.java
geronimo/samples/trunk/samples/async-http/http-remote-app/src/main/webapp/500Error.html
geronimo/samples/trunk/samples/async-http/http-remote-app/src/main/webapp/WEB-INF/web.xml
geronimo/samples/trunk/samples/async-http/http-remote-app/src/main/webapp/dummy.html
geronimo/samples/trunk/samples/bank/bank-ear/src/main/resources/BankDB.sql
geronimo/samples/trunk/samples/dbtester/dbtester-war/src/main/webapp/css/main.css
geronimo/samples/trunk/samples/inventory/inventory-ear/src/main/resources/InventoryDB.sql
geronimo/samples/trunk/samples/ldap-sample-app/ldap-sample-app-war/src/main/webapp/ldap-sample.ldif
geronimo/samples/trunk/samples/myphonebook/myphonebook-ear/src/main/resources/PhoneBook.sql
geronimo/samples/trunk/samples/timereport/timereport-ear/src/main/resources/TimeReportDB.sql
Modified: geronimo/samples/trunk/samples/CustomerService/CustomerService-ear/src/main/resources/CustomerService.sql
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/CustomerService/CustomerService-ear/src/main/resources/CustomerService.sql?rev=656346&r1=656345&r2=656346&view=diff
==============================================================================
--- geronimo/samples/trunk/samples/CustomerService/CustomerService-ear/src/main/resources/CustomerService.sql (original)
+++ geronimo/samples/trunk/samples/CustomerService/CustomerService-ear/src/main/resources/CustomerService.sql Wed May 14 11:16:47 2008
@@ -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.
+ */
+
create table customer (
customerid varchar(10) primary key,
fullname varchar(30),
Modified: geronimo/samples/trunk/samples/async-http/http-local-app/src/main/webapp/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/async-http/http-local-app/src/main/webapp/WEB-INF/web.xml?rev=656346&r1=656345&r2=656346&view=diff
==============================================================================
--- geronimo/samples/trunk/samples/async-http/http-local-app/src/main/webapp/WEB-INF/web.xml (original)
+++ geronimo/samples/trunk/samples/async-http/http-local-app/src/main/webapp/WEB-INF/web.xml Wed May 14 11:16:47 2008
@@ -1,5 +1,20 @@
<?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.
+ -->
<web-app id="web-app_1" 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-app_2_4.xsd"
Modified: geronimo/samples/trunk/samples/async-http/http-remote-app/src/main/java/org/apache/geronimo/PageServlet.java
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/async-http/http-remote-app/src/main/java/org/apache/geronimo/PageServlet.java?rev=656346&r1=656345&r2=656346&view=diff
==============================================================================
--- geronimo/samples/trunk/samples/async-http/http-remote-app/src/main/java/org/apache/geronimo/PageServlet.java (original)
+++ geronimo/samples/trunk/samples/async-http/http-remote-app/src/main/java/org/apache/geronimo/PageServlet.java Wed May 14 11:16:47 2008
@@ -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.
+*/
+
package org.apache.geronimo;
import java.io.IOException;
Modified: geronimo/samples/trunk/samples/async-http/http-remote-app/src/main/webapp/500Error.html
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/async-http/http-remote-app/src/main/webapp/500Error.html?rev=656346&r1=656345&r2=656346&view=diff
==============================================================================
--- geronimo/samples/trunk/samples/async-http/http-remote-app/src/main/webapp/500Error.html (original)
+++ geronimo/samples/trunk/samples/async-http/http-remote-app/src/main/webapp/500Error.html Wed May 14 11:16:47 2008
@@ -1,3 +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.
+-->
<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
<html>
<head>
Modified: geronimo/samples/trunk/samples/async-http/http-remote-app/src/main/webapp/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/async-http/http-remote-app/src/main/webapp/WEB-INF/web.xml?rev=656346&r1=656345&r2=656346&view=diff
==============================================================================
--- geronimo/samples/trunk/samples/async-http/http-remote-app/src/main/webapp/WEB-INF/web.xml (original)
+++ geronimo/samples/trunk/samples/async-http/http-remote-app/src/main/webapp/WEB-INF/web.xml Wed May 14 11:16:47 2008
@@ -1,5 +1,20 @@
<?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.
+ -->
<web-app id="web-app_1" 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-app_2_4.xsd" version="2.4">
<display-name>ServerApp</display-name>
<distributable/>
Modified: geronimo/samples/trunk/samples/async-http/http-remote-app/src/main/webapp/dummy.html
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/async-http/http-remote-app/src/main/webapp/dummy.html?rev=656346&r1=656345&r2=656346&view=diff
==============================================================================
--- geronimo/samples/trunk/samples/async-http/http-remote-app/src/main/webapp/dummy.html (original)
+++ geronimo/samples/trunk/samples/async-http/http-remote-app/src/main/webapp/dummy.html Wed May 14 11:16:47 2008
@@ -1,3 +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.
+-->
<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
<html>
<head>
Modified: geronimo/samples/trunk/samples/bank/bank-ear/src/main/resources/BankDB.sql
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/bank/bank-ear/src/main/resources/BankDB.sql?rev=656346&r1=656345&r2=656346&view=diff
==============================================================================
--- geronimo/samples/trunk/samples/bank/bank-ear/src/main/resources/BankDB.sql (original)
+++ geronimo/samples/trunk/samples/bank/bank-ear/src/main/resources/BankDB.sql Wed May 14 11:16:47 2008
@@ -1,3 +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.
+ */
CREATE TABLE Customer(
customerId VARCHAR(255) PRIMARY KEY,
Modified: geronimo/samples/trunk/samples/dbtester/dbtester-war/src/main/webapp/css/main.css
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/dbtester/dbtester-war/src/main/webapp/css/main.css?rev=656346&r1=656345&r2=656346&view=diff
==============================================================================
--- geronimo/samples/trunk/samples/dbtester/dbtester-war/src/main/webapp/css/main.css (original)
+++ geronimo/samples/trunk/samples/dbtester/dbtester-war/src/main/webapp/css/main.css Wed May 14 11:16:47 2008
@@ -1,3 +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.
+*/
body
{
/*background-color: #FFFFFF;*/
Modified: geronimo/samples/trunk/samples/inventory/inventory-ear/src/main/resources/InventoryDB.sql
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/inventory/inventory-ear/src/main/resources/InventoryDB.sql?rev=656346&r1=656345&r2=656346&view=diff
==============================================================================
--- geronimo/samples/trunk/samples/inventory/inventory-ear/src/main/resources/InventoryDB.sql (original)
+++ geronimo/samples/trunk/samples/inventory/inventory-ear/src/main/resources/InventoryDB.sql Wed May 14 11:16:47 2008
@@ -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.
+ */
+
CREATE TABLE item(
item_id VARCHAR(10) PRIMARY KEY,
item_name VARCHAR(25),
Modified: geronimo/samples/trunk/samples/ldap-sample-app/ldap-sample-app-war/src/main/webapp/ldap-sample.ldif
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/ldap-sample-app/ldap-sample-app-war/src/main/webapp/ldap-sample.ldif?rev=656346&r1=656345&r2=656346&view=diff
==============================================================================
--- geronimo/samples/trunk/samples/ldap-sample-app/ldap-sample-app-war/src/main/webapp/ldap-sample.ldif (original)
+++ geronimo/samples/trunk/samples/ldap-sample-app/ldap-sample-app-war/src/main/webapp/ldap-sample.ldif Wed May 14 11:16:47 2008
@@ -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.
+#
+
# User: system
dn: uid=system,ou=users,ou=system
Modified: geronimo/samples/trunk/samples/myphonebook/myphonebook-ear/src/main/resources/PhoneBook.sql
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/myphonebook/myphonebook-ear/src/main/resources/PhoneBook.sql?rev=656346&r1=656345&r2=656346&view=diff
==============================================================================
--- geronimo/samples/trunk/samples/myphonebook/myphonebook-ear/src/main/resources/PhoneBook.sql (original)
+++ geronimo/samples/trunk/samples/myphonebook/myphonebook-ear/src/main/resources/PhoneBook.sql Wed May 14 11:16:47 2008
@@ -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.
+ */
+
CREATE TABLE phonebook (name VARCHAR(255) PRIMARY KEY, number VARCHAR(255)) ;
INSERT INTO phonebook VALUES('John', '1234');
INSERT INTO phonebook VALUES('Joe', '5678');
\ No newline at end of file
Modified: geronimo/samples/trunk/samples/timereport/timereport-ear/src/main/resources/TimeReportDB.sql
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/timereport/timereport-ear/src/main/resources/TimeReportDB.sql?rev=656346&r1=656345&r2=656346&view=diff
==============================================================================
--- geronimo/samples/trunk/samples/timereport/timereport-ear/src/main/resources/TimeReportDB.sql (original)
+++ geronimo/samples/trunk/samples/timereport/timereport-ear/src/main/resources/TimeReportDB.sql Wed May 14 11:16:47 2008
@@ -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.
+ */
+
CREATE TABLE users(
userid VARCHAR(15) PRIMARY KEY,
password VARCHAR(15),