You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tuscany.apache.org by lr...@apache.org on 2008/08/14 10:59:57 UTC

svn commit: r685822 - in /tuscany/sandbox/ctrezzo/Map-Reduce-Java: ./ src/ src/main/ src/main/java/ src/main/java/services/ src/main/resources/

Author: lresende
Date: Thu Aug 14 01:59:55 2008
New Revision: 685822

URL: http://svn.apache.org/viewvc?rev=685822&view=rev
Log:
TUSCANY-2540 - Applying ctrezzo patch

Added:
    tuscany/sandbox/ctrezzo/Map-Reduce-Java/
    tuscany/sandbox/ctrezzo/Map-Reduce-Java/LICENSE   (with props)
    tuscany/sandbox/ctrezzo/Map-Reduce-Java/NOTICE   (with props)
    tuscany/sandbox/ctrezzo/Map-Reduce-Java/src/
    tuscany/sandbox/ctrezzo/Map-Reduce-Java/src/main/
    tuscany/sandbox/ctrezzo/Map-Reduce-Java/src/main/java/
    tuscany/sandbox/ctrezzo/Map-Reduce-Java/src/main/java/services/
    tuscany/sandbox/ctrezzo/Map-Reduce-Java/src/main/java/services/IntermediateCollector.java   (with props)
    tuscany/sandbox/ctrezzo/Map-Reduce-Java/src/main/java/services/IntermediateCollectorImpl.java   (with props)
    tuscany/sandbox/ctrezzo/Map-Reduce-Java/src/main/java/services/JobConf.java   (with props)
    tuscany/sandbox/ctrezzo/Map-Reduce-Java/src/main/java/services/JobConfImpl.java   (with props)
    tuscany/sandbox/ctrezzo/Map-Reduce-Java/src/main/java/services/JobSubmit.java   (with props)
    tuscany/sandbox/ctrezzo/Map-Reduce-Java/src/main/java/services/KeyValuePair.java   (with props)
    tuscany/sandbox/ctrezzo/Map-Reduce-Java/src/main/java/services/Mapper.java   (with props)
    tuscany/sandbox/ctrezzo/Map-Reduce-Java/src/main/java/services/MapperImpl.java   (with props)
    tuscany/sandbox/ctrezzo/Map-Reduce-Java/src/main/java/services/OutputCollector.java   (with props)
    tuscany/sandbox/ctrezzo/Map-Reduce-Java/src/main/java/services/OutputCollectorImpl.java   (with props)
    tuscany/sandbox/ctrezzo/Map-Reduce-Java/src/main/java/services/Reducer.java   (with props)
    tuscany/sandbox/ctrezzo/Map-Reduce-Java/src/main/java/services/ReducerImpl.java   (with props)
    tuscany/sandbox/ctrezzo/Map-Reduce-Java/src/main/resources/
    tuscany/sandbox/ctrezzo/Map-Reduce-Java/src/main/resources/mapred.composite   (with props)

Added: tuscany/sandbox/ctrezzo/Map-Reduce-Java/LICENSE
URL: http://svn.apache.org/viewvc/tuscany/sandbox/ctrezzo/Map-Reduce-Java/LICENSE?rev=685822&view=auto
==============================================================================
--- tuscany/sandbox/ctrezzo/Map-Reduce-Java/LICENSE (added)
+++ tuscany/sandbox/ctrezzo/Map-Reduce-Java/LICENSE Thu Aug 14 01:59:55 2008
@@ -0,0 +1,205 @@
+
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright [yyyy] [name of copyright owner]
+
+   Licensed 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.
+
+
+

Propchange: tuscany/sandbox/ctrezzo/Map-Reduce-Java/LICENSE
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: tuscany/sandbox/ctrezzo/Map-Reduce-Java/LICENSE
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: tuscany/sandbox/ctrezzo/Map-Reduce-Java/NOTICE
URL: http://svn.apache.org/viewvc/tuscany/sandbox/ctrezzo/Map-Reduce-Java/NOTICE?rev=685822&view=auto
==============================================================================
--- tuscany/sandbox/ctrezzo/Map-Reduce-Java/NOTICE (added)
+++ tuscany/sandbox/ctrezzo/Map-Reduce-Java/NOTICE Thu Aug 14 01:59:55 2008
@@ -0,0 +1,6 @@
+${pom.name}
+Copyright (c) 2005 - 2008 The Apache Software Foundation
+
+This product includes software developed by
+The Apache Software Foundation (http://www.apache.org/).
+

Propchange: tuscany/sandbox/ctrezzo/Map-Reduce-Java/NOTICE
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: tuscany/sandbox/ctrezzo/Map-Reduce-Java/NOTICE
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: tuscany/sandbox/ctrezzo/Map-Reduce-Java/src/main/java/services/IntermediateCollector.java
URL: http://svn.apache.org/viewvc/tuscany/sandbox/ctrezzo/Map-Reduce-Java/src/main/java/services/IntermediateCollector.java?rev=685822&view=auto
==============================================================================
--- tuscany/sandbox/ctrezzo/Map-Reduce-Java/src/main/java/services/IntermediateCollector.java (added)
+++ tuscany/sandbox/ctrezzo/Map-Reduce-Java/src/main/java/services/IntermediateCollector.java Thu Aug 14 01:59:55 2008
@@ -0,0 +1,30 @@
+/*
+ * 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 services;
+
+import org.osoa.sca.annotations.Remotable;
+
+@Remotable
+public interface IntermediateCollector {
+
+	public void collect(String key, int value);
+	
+	public void reducePhase();
+}

Propchange: tuscany/sandbox/ctrezzo/Map-Reduce-Java/src/main/java/services/IntermediateCollector.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: tuscany/sandbox/ctrezzo/Map-Reduce-Java/src/main/java/services/IntermediateCollector.java
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Added: tuscany/sandbox/ctrezzo/Map-Reduce-Java/src/main/java/services/IntermediateCollectorImpl.java
URL: http://svn.apache.org/viewvc/tuscany/sandbox/ctrezzo/Map-Reduce-Java/src/main/java/services/IntermediateCollectorImpl.java?rev=685822&view=auto
==============================================================================
--- tuscany/sandbox/ctrezzo/Map-Reduce-Java/src/main/java/services/IntermediateCollectorImpl.java (added)
+++ tuscany/sandbox/ctrezzo/Map-Reduce-Java/src/main/java/services/IntermediateCollectorImpl.java Thu Aug 14 01:59:55 2008
@@ -0,0 +1,71 @@
+/*
+ * 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 services;
+
+import java.util.Iterator;
+import java.util.Vector;
+
+import org.osoa.sca.annotations.Reference;
+
+public class IntermediateCollectorImpl implements IntermediateCollector {
+
+private Vector<KeyValuePair> table = new Vector<KeyValuePair>();
+	
+	@Reference
+	public Reducer myReducer;
+	
+	
+	public void collect(String key, int value) {
+		table.add(new KeyValuePair(key, value));
+	}
+	
+	public void reducePhase() {	
+		java.util.Collections.sort(table);
+		
+		Iterator<KeyValuePair> it = table.iterator();
+		
+		//no data
+		if(!it.hasNext()) {
+			return;
+		}
+		
+		Vector<Integer> values = new Vector<Integer>();
+		KeyValuePair last = it.next();
+		values.add(last.value);
+		while(it.hasNext()) {
+			KeyValuePair curr = it.next();
+			if(last.compareTo(curr) == 0) {
+				values.add(curr.value);
+				last = curr;
+			}
+			else {
+				myReducer.reduce(last.key, values.iterator());
+				values.clear();
+				values.add(curr.value);
+				last = curr;
+				
+			}	
+		}
+		
+		myReducer.reduce(last.key, values.iterator());
+		
+	}
+
+}

Propchange: tuscany/sandbox/ctrezzo/Map-Reduce-Java/src/main/java/services/IntermediateCollectorImpl.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: tuscany/sandbox/ctrezzo/Map-Reduce-Java/src/main/java/services/IntermediateCollectorImpl.java
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Added: tuscany/sandbox/ctrezzo/Map-Reduce-Java/src/main/java/services/JobConf.java
URL: http://svn.apache.org/viewvc/tuscany/sandbox/ctrezzo/Map-Reduce-Java/src/main/java/services/JobConf.java?rev=685822&view=auto
==============================================================================
--- tuscany/sandbox/ctrezzo/Map-Reduce-Java/src/main/java/services/JobConf.java (added)
+++ tuscany/sandbox/ctrezzo/Map-Reduce-Java/src/main/java/services/JobConf.java Thu Aug 14 01:59:55 2008
@@ -0,0 +1,28 @@
+/*
+ * 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 services;
+
+import org.osoa.sca.annotations.Remotable;
+
+@Remotable
+public interface JobConf {
+
+	public void run();
+}

Propchange: tuscany/sandbox/ctrezzo/Map-Reduce-Java/src/main/java/services/JobConf.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: tuscany/sandbox/ctrezzo/Map-Reduce-Java/src/main/java/services/JobConf.java
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Added: tuscany/sandbox/ctrezzo/Map-Reduce-Java/src/main/java/services/JobConfImpl.java
URL: http://svn.apache.org/viewvc/tuscany/sandbox/ctrezzo/Map-Reduce-Java/src/main/java/services/JobConfImpl.java?rev=685822&view=auto
==============================================================================
--- tuscany/sandbox/ctrezzo/Map-Reduce-Java/src/main/java/services/JobConfImpl.java (added)
+++ tuscany/sandbox/ctrezzo/Map-Reduce-Java/src/main/java/services/JobConfImpl.java Thu Aug 14 01:59:55 2008
@@ -0,0 +1,110 @@
+/*
+ * 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 services;
+
+import java.io.BufferedReader;
+import java.io.DataInputStream;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileNotFoundException;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.InputStreamReader;
+import java.io.PrintWriter;
+import java.util.Iterator;
+import org.osoa.sca.annotations.Property;
+import org.osoa.sca.annotations.Reference;
+
+public class JobConfImpl implements JobConf {
+
+	@Property
+	public String input;
+	@Property
+	public String output;
+	@Reference
+	public Mapper myMapper;
+	@Reference
+	public IntermediateCollector iCollector;
+	@Reference
+	public OutputCollector oCollector;
+	
+	public void run() {
+		
+		FileInputStream fstream = null;
+		try {
+			fstream = new FileInputStream(input);
+		}
+		catch(FileNotFoundException e) {
+			System.out.println("ERROR: Input file does not exist.");
+			return;
+		}
+		
+		DataInputStream in = new DataInputStream(fstream);
+		BufferedReader br = new BufferedReader(new InputStreamReader(in));
+	       
+		//Read File Line By Line
+	    String strLine = null;
+	    int count = 1;
+	    try {
+	    	strLine = br.readLine();
+	    }
+	    catch(IOException e) {
+	    	System.out.println("ERROR: Input file can not be read.");
+	    	return;
+	    }
+	    while (strLine != null) {
+	    	myMapper.map(count, strLine);
+	    	count++;
+	    	
+	    	try {
+		    	strLine = br.readLine();
+		    }
+		    catch(IOException e) {
+		    	System.out.println("ERROR: Input file can not be read.");
+		    	return;
+		    }
+	    }
+	    
+	    iCollector.reducePhase();
+
+	    Iterator<KeyValuePair> it = oCollector.getCollection();
+	    
+	    //Write to output file
+	    
+	    FileOutputStream oStream = null;
+	    try {
+	    	oStream = new FileOutputStream(output);
+	    }
+	    catch(FileNotFoundException e) {
+	    	System.out.println("ERROR: Output file can not be written to.");
+	    	return;
+	    }
+	    
+	    PrintWriter pw = new PrintWriter(oStream);
+	    
+	    while(it.hasNext()) {
+	    	KeyValuePair kv = it.next();
+	    	pw.println(kv.key + " " + kv.value);
+	    }
+	    
+	    pw.close();
+	}
+
+}

Propchange: tuscany/sandbox/ctrezzo/Map-Reduce-Java/src/main/java/services/JobConfImpl.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: tuscany/sandbox/ctrezzo/Map-Reduce-Java/src/main/java/services/JobConfImpl.java
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Added: tuscany/sandbox/ctrezzo/Map-Reduce-Java/src/main/java/services/JobSubmit.java
URL: http://svn.apache.org/viewvc/tuscany/sandbox/ctrezzo/Map-Reduce-Java/src/main/java/services/JobSubmit.java?rev=685822&view=auto
==============================================================================
--- tuscany/sandbox/ctrezzo/Map-Reduce-Java/src/main/java/services/JobSubmit.java (added)
+++ tuscany/sandbox/ctrezzo/Map-Reduce-Java/src/main/java/services/JobSubmit.java Thu Aug 14 01:59:55 2008
@@ -0,0 +1,67 @@
+/*
+ * 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 services;
+
+import java.io.File;
+
+import org.apache.tuscany.sca.host.embedded.SCADomain;
+
+
+public class JobSubmit {
+
+	/**
+	 * @param args
+	 */
+	public static void main(String[] args) {
+		
+		System.out.println("Starting ...");
+        SCADomain scaDomain = SCADomain.newInstance("mapred.composite");
+        JobConf myJob = scaDomain.getService(JobConf.class, "JobConf");
+        System.out.println("Executing Map-Reduce Job.");
+        myJob.run();
+        System.out.println("Map-Reduce Job Complete.");
+        System.out.println("Closing Domain ...");
+        scaDomain.close();
+        System.out.println();
+		
+		
+		//Test code to check java classes without SCA
+		/*
+		JobConfImpl jConf = new JobConfImpl();
+		MapperImpl myMap = new MapperImpl();
+		IntermediateCollectorImpl iColl = new IntermediateCollectorImpl();
+		ReducerImpl myRed = new ReducerImpl();
+		OutputCollectorImpl oColl = new OutputCollectorImpl();
+		
+		jConf.input = "/test/input/file01.txt";
+		jConf.output = "/test/output/out.txt";
+		jConf.myMapper = myMap;
+		jConf.oCollector = oColl;
+		jConf.iCollector = iColl;
+		myMap.iCollector = iColl;
+		iColl.myReducer = myRed;
+		myRed.oCollector = oColl;
+		
+		jConf.run();
+		*/
+
+	}
+
+}

Propchange: tuscany/sandbox/ctrezzo/Map-Reduce-Java/src/main/java/services/JobSubmit.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: tuscany/sandbox/ctrezzo/Map-Reduce-Java/src/main/java/services/JobSubmit.java
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Added: tuscany/sandbox/ctrezzo/Map-Reduce-Java/src/main/java/services/KeyValuePair.java
URL: http://svn.apache.org/viewvc/tuscany/sandbox/ctrezzo/Map-Reduce-Java/src/main/java/services/KeyValuePair.java?rev=685822&view=auto
==============================================================================
--- tuscany/sandbox/ctrezzo/Map-Reduce-Java/src/main/java/services/KeyValuePair.java (added)
+++ tuscany/sandbox/ctrezzo/Map-Reduce-Java/src/main/java/services/KeyValuePair.java Thu Aug 14 01:59:55 2008
@@ -0,0 +1,42 @@
+/*
+ * 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 services;
+
+public class KeyValuePair implements Comparable<KeyValuePair> {
+	
+	public String key;
+	public int value;
+	
+	public KeyValuePair() {
+		key = "";
+		value = 0;
+	}
+	
+	public KeyValuePair(String k, int v) {
+		key = k;
+		value = v;
+	}
+	
+	public int compareTo(KeyValuePair o) {
+		
+		return key.compareTo(o.key);
+	}
+
+}

Propchange: tuscany/sandbox/ctrezzo/Map-Reduce-Java/src/main/java/services/KeyValuePair.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: tuscany/sandbox/ctrezzo/Map-Reduce-Java/src/main/java/services/KeyValuePair.java
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Added: tuscany/sandbox/ctrezzo/Map-Reduce-Java/src/main/java/services/Mapper.java
URL: http://svn.apache.org/viewvc/tuscany/sandbox/ctrezzo/Map-Reduce-Java/src/main/java/services/Mapper.java?rev=685822&view=auto
==============================================================================
--- tuscany/sandbox/ctrezzo/Map-Reduce-Java/src/main/java/services/Mapper.java (added)
+++ tuscany/sandbox/ctrezzo/Map-Reduce-Java/src/main/java/services/Mapper.java Thu Aug 14 01:59:55 2008
@@ -0,0 +1,28 @@
+/*
+ * 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 services;
+
+import org.osoa.sca.annotations.Remotable;
+
+@Remotable
+public interface Mapper {
+	
+	public void map(int key, String value);
+}

Propchange: tuscany/sandbox/ctrezzo/Map-Reduce-Java/src/main/java/services/Mapper.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: tuscany/sandbox/ctrezzo/Map-Reduce-Java/src/main/java/services/Mapper.java
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Added: tuscany/sandbox/ctrezzo/Map-Reduce-Java/src/main/java/services/MapperImpl.java
URL: http://svn.apache.org/viewvc/tuscany/sandbox/ctrezzo/Map-Reduce-Java/src/main/java/services/MapperImpl.java?rev=685822&view=auto
==============================================================================
--- tuscany/sandbox/ctrezzo/Map-Reduce-Java/src/main/java/services/MapperImpl.java (added)
+++ tuscany/sandbox/ctrezzo/Map-Reduce-Java/src/main/java/services/MapperImpl.java Thu Aug 14 01:59:55 2008
@@ -0,0 +1,38 @@
+/*
+ * 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 services;
+
+import java.util.StringTokenizer;
+import org.osoa.sca.annotations.Reference;
+
+public class MapperImpl implements Mapper {
+
+	@Reference
+	public IntermediateCollector iCollector2;
+	
+	public void map(int key, String value) {
+		
+	    StringTokenizer itr = new StringTokenizer(value);
+	    while (itr.hasMoreTokens()) {
+	        iCollector2.collect(itr.nextToken(), 1);
+	    }
+	}
+
+}

Propchange: tuscany/sandbox/ctrezzo/Map-Reduce-Java/src/main/java/services/MapperImpl.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: tuscany/sandbox/ctrezzo/Map-Reduce-Java/src/main/java/services/MapperImpl.java
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Added: tuscany/sandbox/ctrezzo/Map-Reduce-Java/src/main/java/services/OutputCollector.java
URL: http://svn.apache.org/viewvc/tuscany/sandbox/ctrezzo/Map-Reduce-Java/src/main/java/services/OutputCollector.java?rev=685822&view=auto
==============================================================================
--- tuscany/sandbox/ctrezzo/Map-Reduce-Java/src/main/java/services/OutputCollector.java (added)
+++ tuscany/sandbox/ctrezzo/Map-Reduce-Java/src/main/java/services/OutputCollector.java Thu Aug 14 01:59:55 2008
@@ -0,0 +1,31 @@
+/*
+ * 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 services;
+
+import java.util.Iterator;
+import org.osoa.sca.annotations.Remotable;
+
+@Remotable
+public interface OutputCollector {
+
+	public void collect(String key, int value);
+	
+	public Iterator<KeyValuePair> getCollection();
+}

Propchange: tuscany/sandbox/ctrezzo/Map-Reduce-Java/src/main/java/services/OutputCollector.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: tuscany/sandbox/ctrezzo/Map-Reduce-Java/src/main/java/services/OutputCollector.java
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Added: tuscany/sandbox/ctrezzo/Map-Reduce-Java/src/main/java/services/OutputCollectorImpl.java
URL: http://svn.apache.org/viewvc/tuscany/sandbox/ctrezzo/Map-Reduce-Java/src/main/java/services/OutputCollectorImpl.java?rev=685822&view=auto
==============================================================================
--- tuscany/sandbox/ctrezzo/Map-Reduce-Java/src/main/java/services/OutputCollectorImpl.java (added)
+++ tuscany/sandbox/ctrezzo/Map-Reduce-Java/src/main/java/services/OutputCollectorImpl.java Thu Aug 14 01:59:55 2008
@@ -0,0 +1,47 @@
+/*
+ * 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 services;
+
+import java.util.Vector;
+import java.util.Iterator;
+
+public class OutputCollectorImpl implements OutputCollector {
+
+	private Vector<KeyValuePair> table = new Vector<KeyValuePair>();
+	private boolean sorted = false;
+	
+	
+	public void collect(String key, int value) {
+
+		table.add(new KeyValuePair(key, value));
+		sorted = false;
+	}
+	
+	public Iterator<KeyValuePair> getCollection() {
+		
+		if(!sorted) {
+			java.util.Collections.sort(table);
+			sorted = true;
+		}
+		
+		return table.iterator();
+	}
+		
+}

Propchange: tuscany/sandbox/ctrezzo/Map-Reduce-Java/src/main/java/services/OutputCollectorImpl.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: tuscany/sandbox/ctrezzo/Map-Reduce-Java/src/main/java/services/OutputCollectorImpl.java
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Added: tuscany/sandbox/ctrezzo/Map-Reduce-Java/src/main/java/services/Reducer.java
URL: http://svn.apache.org/viewvc/tuscany/sandbox/ctrezzo/Map-Reduce-Java/src/main/java/services/Reducer.java?rev=685822&view=auto
==============================================================================
--- tuscany/sandbox/ctrezzo/Map-Reduce-Java/src/main/java/services/Reducer.java (added)
+++ tuscany/sandbox/ctrezzo/Map-Reduce-Java/src/main/java/services/Reducer.java Thu Aug 14 01:59:55 2008
@@ -0,0 +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.    
+ */
+
+package services;
+
+import java.util.Iterator;
+import org.osoa.sca.annotations.Remotable;
+
+@Remotable
+public interface Reducer {
+
+	public void reduce(String key, Iterator<Integer> values);
+}

Propchange: tuscany/sandbox/ctrezzo/Map-Reduce-Java/src/main/java/services/Reducer.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: tuscany/sandbox/ctrezzo/Map-Reduce-Java/src/main/java/services/Reducer.java
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Added: tuscany/sandbox/ctrezzo/Map-Reduce-Java/src/main/java/services/ReducerImpl.java
URL: http://svn.apache.org/viewvc/tuscany/sandbox/ctrezzo/Map-Reduce-Java/src/main/java/services/ReducerImpl.java?rev=685822&view=auto
==============================================================================
--- tuscany/sandbox/ctrezzo/Map-Reduce-Java/src/main/java/services/ReducerImpl.java (added)
+++ tuscany/sandbox/ctrezzo/Map-Reduce-Java/src/main/java/services/ReducerImpl.java Thu Aug 14 01:59:55 2008
@@ -0,0 +1,39 @@
+/*
+ * 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 services;
+
+import java.util.Iterator;
+import org.osoa.sca.annotations.Reference;
+
+public class ReducerImpl implements Reducer {
+
+	@Reference
+	public OutputCollector oCollector2;
+	
+	public void reduce(String key, Iterator<Integer> values) {
+		int sum = 0;
+	    while (values.hasNext()) {
+	    	sum += values.next().intValue();
+	    }
+	    
+	    oCollector2.collect(key, sum);
+	}
+
+}

Propchange: tuscany/sandbox/ctrezzo/Map-Reduce-Java/src/main/java/services/ReducerImpl.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: tuscany/sandbox/ctrezzo/Map-Reduce-Java/src/main/java/services/ReducerImpl.java
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Added: tuscany/sandbox/ctrezzo/Map-Reduce-Java/src/main/resources/mapred.composite
URL: http://svn.apache.org/viewvc/tuscany/sandbox/ctrezzo/Map-Reduce-Java/src/main/resources/mapred.composite?rev=685822&view=auto
==============================================================================
--- tuscany/sandbox/ctrezzo/Map-Reduce-Java/src/main/resources/mapred.composite (added)
+++ tuscany/sandbox/ctrezzo/Map-Reduce-Java/src/main/resources/mapred.composite Thu Aug 14 01:59:55 2008
@@ -0,0 +1,59 @@
+<?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.    
+-->
+
+
+<composite	xmlns="http://www.osoa.org/xmlns/sca/1.0"
+			xmlns:t="http://tuscany.apache.org/xmlns/sca/1.0"
+			targetNamespace="http://mapred"
+			name="mapred">
+    
+	<component name="JobConf">
+		<implementation.java class="services.JobConfImpl"/> 
+		
+		<property name="input">/test/input/file01.txt</property>
+		<property name="output">/test/output/out.txt</property>
+	
+   		<reference name="myMapper" target="MapperComponent"/>
+		<reference name="iCollector" target="IntermediateCollectorComponent"/>	
+		<reference name="oCollector" target="OutputCollectorComponent"/>
+	</component> 
+ 	
+	<component name="MapperComponent">
+		<implementation.java class="services.MapperImpl"/>	
+		<reference name="iCollector2" target="IntermediateCollectorComponent"/>   	
+	</component>
+    
+	<component name="IntermediateCollectorComponent">
+		<implementation.java class="services.IntermediateCollectorImpl"/>	
+		<reference name="myReducer" target="ReducerComponent"/>   	
+	</component>
+	
+	<component name="ReducerComponent">
+		<implementation.java class="services.ReducerImpl"/>
+		<reference name="oCollector2" target="OutputCollectorComponent"/>   	
+	</component>
+	
+	<component name="OutputCollectorComponent">
+		<implementation.java class="services.OutputCollectorImpl"/>  		
+	</component>
+
+
+</composite>
\ No newline at end of file

Propchange: tuscany/sandbox/ctrezzo/Map-Reduce-Java/src/main/resources/mapred.composite
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: tuscany/sandbox/ctrezzo/Map-Reduce-Java/src/main/resources/mapred.composite
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Propchange: tuscany/sandbox/ctrezzo/Map-Reduce-Java/src/main/resources/mapred.composite
------------------------------------------------------------------------------
    svn:mime-type = text/xml