TUSCANY-3522: Apply alheaders.patch submitted by Eranda.

git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@1137606 13f79535-47bb-0310-9956-ffa450edef68

9 files changed, 211 insertions, 37 deletions

diff --git a/collaboration/GSoC-2011-Eranda/cassandra/pom.xml b/collaboration/GSoC-2011-Eranda/cassandra/pom.xml
index 9a685054d8..6c52fbfe9d 100644
--- a/collaboration/GSoC-2011-Eranda/cassandra/pom.xml
+++ b/collaboration/GSoC-2011-Eranda/cassandra/pom.xml
@@ -1,3 +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.

+-->

 <project xmlns="http://maven.apache.org/POM/4.0.0"

          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"

          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">

diff --git a/collaboration/GSoC-2011-Eranda/twitapp/pom.xml b/collaboration/GSoC-2011-Eranda/twitapp/pom.xml
new file mode 100644
index 0000000000..d616c75264
--- /dev/null
+++ b/collaboration/GSoC-2011-Eranda/twitapp/pom.xml
@@ -0,0 +1,47 @@
+<?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.
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+    <groupId>org.apache.tuscany</groupId>
+    <artifactId>nosql-datastore</artifactId>
+    <version>0.0.1</version>
+
+    <packaging>jar</packaging>
+    <name>tuscany</name>
+    <url>http://maven.apache.org</url>
+    <properties>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+    </properties>
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <version>2.0.2</version>
+                <configuration>
+                    <source>1.5</source>
+                    <target>1.5</target>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+</project>
diff --git a/collaboration/GSoC-2011-Eranda/twitapp/src/main/java/twitapp/services/AppManager.java b/collaboration/GSoC-2011-Eranda/twitapp/src/main/java/twitapp/services/AppManager.java
index 0ce20feeba..fd269d60f4 100644
--- a/collaboration/GSoC-2011-Eranda/twitapp/src/main/java/twitapp/services/AppManager.java
+++ b/collaboration/GSoC-2011-Eranda/twitapp/src/main/java/twitapp/services/AppManager.java
@@ -1,4 +1,22 @@
-package main.java.twitapp.services;

+/*

+ * 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 twitapp.services;

 

 import java.util.ArrayList;

 import java.util.Iterator;

diff --git a/collaboration/GSoC-2011-Eranda/twitapp/src/main/java/twitapp/services/Twit.java b/collaboration/GSoC-2011-Eranda/twitapp/src/main/java/twitapp/services/Twit.java
index ec842d65e5..e63b1cae5c 100644
--- a/collaboration/GSoC-2011-Eranda/twitapp/src/main/java/twitapp/services/Twit.java
+++ b/collaboration/GSoC-2011-Eranda/twitapp/src/main/java/twitapp/services/Twit.java
@@ -1,4 +1,22 @@
-package main.java.twitapp.services;

+/*

+ * 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 twitapp.services;

 

 import java.util.Date;

 

diff --git a/collaboration/GSoC-2011-Eranda/twitapp/src/main/java/twitapp/services/User.java b/collaboration/GSoC-2011-Eranda/twitapp/src/main/java/twitapp/services/User.java
index cd113db443..7cc3b0cddd 100644
--- a/collaboration/GSoC-2011-Eranda/twitapp/src/main/java/twitapp/services/User.java
+++ b/collaboration/GSoC-2011-Eranda/twitapp/src/main/java/twitapp/services/User.java
@@ -1,4 +1,22 @@
-package main.java.twitapp.services;

+/*

+ * 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 twitapp.services;

 

 import java.util.ArrayList;

 import java.util.Date;

diff --git a/collaboration/GSoC-2011-Eranda/twitapp/src/main/java/twitapp/services/UserBase.java b/collaboration/GSoC-2011-Eranda/twitapp/src/main/java/twitapp/services/UserBase.java
index 046f0701f8..7baef8d638 100644
--- a/collaboration/GSoC-2011-Eranda/twitapp/src/main/java/twitapp/services/UserBase.java
+++ b/collaboration/GSoC-2011-Eranda/twitapp/src/main/java/twitapp/services/UserBase.java
@@ -1,4 +1,22 @@
-package main.java.twitapp.services;

+/*

+ * 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 twitapp.services;

 

 import java.util.HashMap;

 

diff --git a/collaboration/GSoC-2011-Eranda/twitapp/src/main/java/twitapp/services/UserManager.java b/collaboration/GSoC-2011-Eranda/twitapp/src/main/java/twitapp/services/UserManager.java
index cfae0353bd..6d0aa40dbe 100644
--- a/collaboration/GSoC-2011-Eranda/twitapp/src/main/java/twitapp/services/UserManager.java
+++ b/collaboration/GSoC-2011-Eranda/twitapp/src/main/java/twitapp/services/UserManager.java
@@ -1,4 +1,22 @@
-package main.java.twitapp.services;

+/*

+ * 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 twitapp.services;

 

 public class UserManager {

 	

diff --git a/collaboration/GSoC-2011-Eranda/twitapp/src/main/java/twitapp/test/TwitAppTest.java b/collaboration/GSoC-2011-Eranda/twitapp/src/main/java/twitapp/test/TwitAppTest.java
index f9d6baec8b..e69de29bb2 100644
--- a/collaboration/GSoC-2011-Eranda/twitapp/src/main/java/twitapp/test/TwitAppTest.java
+++ b/collaboration/GSoC-2011-Eranda/twitapp/src/main/java/twitapp/test/TwitAppTest.java
@@ -1,32 +0,0 @@
-package main.java.twitapp.test;

-

-import java.util.Iterator;

-

-import main.java.twitapp.services.AppManager;

-import main.java.twitapp.services.Twit;

-import main.java.twitapp.services.UserManager;

-

-public class TwitAppTest {

-

-	/**

-	 * @param args

-	 */

-	public static void main(String[] args) {

-		UserManager userManager = new UserManager();	

-		userManager.addUser("eranda", "Eranda Sooriyabandara");

-		userManager.addUser("ishara", "Ishara Karunarathne");

-		

-		AppManager manager1 = new AppManager("eranda");

-		manager1.twit("Won the world cup 2011");

-		

-		AppManager manager2 = new AppManager("ishara");

-		manager2.follow("eranda");

-		

-		Iterator<Twit> twits = manager2.getFollowerTwits("eranda");

-		while(twits.hasNext()){

-			System.out.println(twits.next().toString());

-		}

-

-	}

-

-}

diff --git a/collaboration/GSoC-2011-Eranda/twitapp/src/test/java/twitapp/TwitAppTest.java b/collaboration/GSoC-2011-Eranda/twitapp/src/test/java/twitapp/TwitAppTest.java
new file mode 100644
index 0000000000..9e81d5af2f
--- /dev/null
+++ b/collaboration/GSoC-2011-Eranda/twitapp/src/test/java/twitapp/TwitAppTest.java
@@ -0,0 +1,50 @@
+/*

+ * 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 twitapp.test;

+

+import java.util.Iterator;

+

+import twitapp.services.AppManager;

+import twitapp.services.Twit;

+import twitapp.services.UserManager;

+

+public class TwitAppTest {

+

+	/**

+	 * @param args

+	 */

+	public static void main(String[] args) {

+		UserManager userManager = new UserManager();	

+		userManager.addUser("eranda", "Eranda Sooriyabandara");

+		userManager.addUser("ishara", "Ishara Karunarathne");

+		

+		AppManager manager1 = new AppManager("eranda");

+		manager1.twit("Won the world cup 2011");

+		

+		AppManager manager2 = new AppManager("ishara");

+		manager2.follow("eranda");

+		

+		Iterator<Twit> twits = manager2.getFollowerTwits("eranda");

+		while(twits.hasNext()){

+			System.out.println(twits.next().toString());

+		}

+

+	}

+

+}