You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@etch.apache.org by sc...@apache.org on 2009/02/27 18:11:02 UTC

svn commit: r748600 - in /incubator/etch/branches/dynamo: examples/example/src/main/java/org/apache/etch/examples/example/ scripts/

Author: sccomer
Date: Fri Feb 27 17:11:01 2009
New Revision: 748600

URL: http://svn.apache.org/viewvc?rev=748600&view=rev
Log:
fix the eclipse build script.

fix the comment headers.

fix MainFooListener to pass res when creating the listener to enable the finding of the service to be loaded.

Modified:
    incubator/etch/branches/dynamo/examples/example/src/main/java/org/apache/etch/examples/example/ImplExampleFooClient.java
    incubator/etch/branches/dynamo/examples/example/src/main/java/org/apache/etch/examples/example/ImplExampleFooServer.java
    incubator/etch/branches/dynamo/examples/example/src/main/java/org/apache/etch/examples/example/ImplFooClient.java
    incubator/etch/branches/dynamo/examples/example/src/main/java/org/apache/etch/examples/example/ImplFooServer.java
    incubator/etch/branches/dynamo/examples/example/src/main/java/org/apache/etch/examples/example/MainExampleFooClient.java
    incubator/etch/branches/dynamo/examples/example/src/main/java/org/apache/etch/examples/example/MainExampleFooListener.java
    incubator/etch/branches/dynamo/examples/example/src/main/java/org/apache/etch/examples/example/MainExampleListener.java
    incubator/etch/branches/dynamo/examples/example/src/main/java/org/apache/etch/examples/example/MainFooClient.java
    incubator/etch/branches/dynamo/examples/example/src/main/java/org/apache/etch/examples/example/MainFooListener.java
    incubator/etch/branches/dynamo/scripts/compEtchFilesForJava.bat

Modified: incubator/etch/branches/dynamo/examples/example/src/main/java/org/apache/etch/examples/example/ImplExampleFooClient.java
URL: http://svn.apache.org/viewvc/incubator/etch/branches/dynamo/examples/example/src/main/java/org/apache/etch/examples/example/ImplExampleFooClient.java?rev=748600&r1=748599&r2=748600&view=diff
==============================================================================
--- incubator/etch/branches/dynamo/examples/example/src/main/java/org/apache/etch/examples/example/ImplExampleFooClient.java (original)
+++ incubator/etch/branches/dynamo/examples/example/src/main/java/org/apache/etch/examples/example/ImplExampleFooClient.java Fri Feb 27 17:11:01 2009
@@ -1,9 +1,22 @@
-// This file automatically generated by:
-//   Apache Etch 1.1.0-incubating (LOCAL-0) / java 1.1.0-incubating (LOCAL-0)
-//   Thu Feb 19 12:21:28 CST 2009
-// This file is automatically created for your convenience and will not be
-// overwritten once it exists! Please edit this file as necessary to implement
-// your service logic.
+/* $Id$
+ *
+ * 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.etch.examples.example;
 

Modified: incubator/etch/branches/dynamo/examples/example/src/main/java/org/apache/etch/examples/example/ImplExampleFooServer.java
URL: http://svn.apache.org/viewvc/incubator/etch/branches/dynamo/examples/example/src/main/java/org/apache/etch/examples/example/ImplExampleFooServer.java?rev=748600&r1=748599&r2=748600&view=diff
==============================================================================
--- incubator/etch/branches/dynamo/examples/example/src/main/java/org/apache/etch/examples/example/ImplExampleFooServer.java (original)
+++ incubator/etch/branches/dynamo/examples/example/src/main/java/org/apache/etch/examples/example/ImplExampleFooServer.java Fri Feb 27 17:11:01 2009
@@ -1,9 +1,22 @@
-// This file automatically generated by:
-//   Apache Etch 1.1.0-incubating (LOCAL-0) / java 1.1.0-incubating (LOCAL-0)
-//   Thu Feb 19 12:21:28 CST 2009
-// This file is automatically created for your convenience and will not be
-// overwritten once it exists! Please edit this file as necessary to implement
-// your service logic.
+/* $Id$
+ *
+ * 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.etch.examples.example;
 

Modified: incubator/etch/branches/dynamo/examples/example/src/main/java/org/apache/etch/examples/example/ImplFooClient.java
URL: http://svn.apache.org/viewvc/incubator/etch/branches/dynamo/examples/example/src/main/java/org/apache/etch/examples/example/ImplFooClient.java?rev=748600&r1=748599&r2=748600&view=diff
==============================================================================
--- incubator/etch/branches/dynamo/examples/example/src/main/java/org/apache/etch/examples/example/ImplFooClient.java (original)
+++ incubator/etch/branches/dynamo/examples/example/src/main/java/org/apache/etch/examples/example/ImplFooClient.java Fri Feb 27 17:11:01 2009
@@ -1,9 +1,22 @@
-// This file automatically generated by:
-//   Apache Etch 1.1.0-incubating (LOCAL-0) / java 1.1.0-incubating (LOCAL-0)
-//   Thu Feb 19 12:21:33 CST 2009
-// This file is automatically created for your convenience and will not be
-// overwritten once it exists! Please edit this file as necessary to implement
-// your service logic.
+/* $Id$
+ *
+ * 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.etch.examples.example;
 

Modified: incubator/etch/branches/dynamo/examples/example/src/main/java/org/apache/etch/examples/example/ImplFooServer.java
URL: http://svn.apache.org/viewvc/incubator/etch/branches/dynamo/examples/example/src/main/java/org/apache/etch/examples/example/ImplFooServer.java?rev=748600&r1=748599&r2=748600&view=diff
==============================================================================
--- incubator/etch/branches/dynamo/examples/example/src/main/java/org/apache/etch/examples/example/ImplFooServer.java (original)
+++ incubator/etch/branches/dynamo/examples/example/src/main/java/org/apache/etch/examples/example/ImplFooServer.java Fri Feb 27 17:11:01 2009
@@ -1,9 +1,22 @@
-// This file automatically generated by:
-//   Apache Etch 1.1.0-incubating (LOCAL-0) / java 1.1.0-incubating (LOCAL-0)
-//   Thu Feb 19 12:21:33 CST 2009
-// This file is automatically created for your convenience and will not be
-// overwritten once it exists! Please edit this file as necessary to implement
-// your service logic.
+/* $Id$
+ *
+ * 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.etch.examples.example;
 

Modified: incubator/etch/branches/dynamo/examples/example/src/main/java/org/apache/etch/examples/example/MainExampleFooClient.java
URL: http://svn.apache.org/viewvc/incubator/etch/branches/dynamo/examples/example/src/main/java/org/apache/etch/examples/example/MainExampleFooClient.java?rev=748600&r1=748599&r2=748600&view=diff
==============================================================================
--- incubator/etch/branches/dynamo/examples/example/src/main/java/org/apache/etch/examples/example/MainExampleFooClient.java (original)
+++ incubator/etch/branches/dynamo/examples/example/src/main/java/org/apache/etch/examples/example/MainExampleFooClient.java Fri Feb 27 17:11:01 2009
@@ -1,9 +1,22 @@
-// This file automatically generated by:
-//   Apache Etch 1.1.0-incubating (LOCAL-0) / java 1.1.0-incubating (LOCAL-0)
-//   Thu Feb 19 12:21:28 CST 2009
-// This file is automatically created for your convenience and will not be
-// overwritten once it exists! Please edit this file as necessary to implement
-// your service logic.
+/* $Id$
+ *
+ * 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.etch.examples.example;
 

Modified: incubator/etch/branches/dynamo/examples/example/src/main/java/org/apache/etch/examples/example/MainExampleFooListener.java
URL: http://svn.apache.org/viewvc/incubator/etch/branches/dynamo/examples/example/src/main/java/org/apache/etch/examples/example/MainExampleFooListener.java?rev=748600&r1=748599&r2=748600&view=diff
==============================================================================
--- incubator/etch/branches/dynamo/examples/example/src/main/java/org/apache/etch/examples/example/MainExampleFooListener.java (original)
+++ incubator/etch/branches/dynamo/examples/example/src/main/java/org/apache/etch/examples/example/MainExampleFooListener.java Fri Feb 27 17:11:01 2009
@@ -1,9 +1,22 @@
-// This file automatically generated by:
-//   Apache Etch 1.1.0-incubating (LOCAL-0) / java 1.1.0-incubating (LOCAL-0)
-//   Thu Feb 19 12:21:28 CST 2009
-// This file is automatically created for your convenience and will not be
-// overwritten once it exists! Please edit this file as necessary to implement
-// your service logic.
+/* $Id$
+ *
+ * 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.etch.examples.example;
 

Modified: incubator/etch/branches/dynamo/examples/example/src/main/java/org/apache/etch/examples/example/MainExampleListener.java
URL: http://svn.apache.org/viewvc/incubator/etch/branches/dynamo/examples/example/src/main/java/org/apache/etch/examples/example/MainExampleListener.java?rev=748600&r1=748599&r2=748600&view=diff
==============================================================================
--- incubator/etch/branches/dynamo/examples/example/src/main/java/org/apache/etch/examples/example/MainExampleListener.java (original)
+++ incubator/etch/branches/dynamo/examples/example/src/main/java/org/apache/etch/examples/example/MainExampleListener.java Fri Feb 27 17:11:01 2009
@@ -51,8 +51,7 @@
 		Resources res = new Resources();
 		res.put( FooServerFactory.class.getName(), (FooServerFactory) factory );
 		
-		ServerFactory listener = ExampleHelper.newListener( uri, res,
-			factory );
+		ServerFactory listener = ExampleHelper.newListener( uri, res, factory );
 
 		// Start the Listener
 		listener.transportControl( Transport.START_AND_WAIT_UP, 4000 );

Modified: incubator/etch/branches/dynamo/examples/example/src/main/java/org/apache/etch/examples/example/MainFooClient.java
URL: http://svn.apache.org/viewvc/incubator/etch/branches/dynamo/examples/example/src/main/java/org/apache/etch/examples/example/MainFooClient.java?rev=748600&r1=748599&r2=748600&view=diff
==============================================================================
--- incubator/etch/branches/dynamo/examples/example/src/main/java/org/apache/etch/examples/example/MainFooClient.java (original)
+++ incubator/etch/branches/dynamo/examples/example/src/main/java/org/apache/etch/examples/example/MainFooClient.java Fri Feb 27 17:11:01 2009
@@ -1,9 +1,22 @@
-// This file automatically generated by:
-//   Apache Etch 1.1.0-incubating (LOCAL-0) / java 1.1.0-incubating (LOCAL-0)
-//   Thu Feb 19 12:21:33 CST 2009
-// This file is automatically created for your convenience and will not be
-// overwritten once it exists! Please edit this file as necessary to implement
-// your service logic.
+/* $Id$
+ *
+ * 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.etch.examples.example;
 

Modified: incubator/etch/branches/dynamo/examples/example/src/main/java/org/apache/etch/examples/example/MainFooListener.java
URL: http://svn.apache.org/viewvc/incubator/etch/branches/dynamo/examples/example/src/main/java/org/apache/etch/examples/example/MainFooListener.java?rev=748600&r1=748599&r2=748600&view=diff
==============================================================================
--- incubator/etch/branches/dynamo/examples/example/src/main/java/org/apache/etch/examples/example/MainFooListener.java (original)
+++ incubator/etch/branches/dynamo/examples/example/src/main/java/org/apache/etch/examples/example/MainFooListener.java Fri Feb 27 17:11:01 2009
@@ -1,9 +1,22 @@
-// This file automatically generated by:
-//   Apache Etch 1.1.0-incubating (LOCAL-0) / java 1.1.0-incubating (LOCAL-0)
-//   Thu Feb 19 12:21:33 CST 2009
-// This file is automatically created for your convenience and will not be
-// overwritten once it exists! Please edit this file as necessary to implement
-// your service logic.
+/* $Id$
+ *
+ * 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.etch.examples.example;
 
@@ -35,20 +48,20 @@
 		Resources res = new Resources();
 		res.put( ExampleServerFactory.class.getName(), (ExampleServerFactory) factory );
 		
-		ServerFactory listener = FooHelper.newListener( uri, null, factory );
+		ServerFactory listener = FooHelper.newListener( uri, res, factory );
 
 		// Start the Listener
 		listener.transportControl( Transport.START_AND_WAIT_UP, 4000 );
 	}
 
-	public FooServer newFooServer( RemoteFooClient client )
-	{
-		return new ImplFooServer( client );
-	}
-
 	public ExampleServer newExampleServer( RemoteExampleClient client )
 		throws Exception
 	{
 		return new ImplExampleServer( client );
 	}
+
+	public FooServer newFooServer( RemoteFooClient client )
+	{
+		return new ImplFooServer( client );
+	}
 }

Modified: incubator/etch/branches/dynamo/scripts/compEtchFilesForJava.bat
URL: http://svn.apache.org/viewvc/incubator/etch/branches/dynamo/scripts/compEtchFilesForJava.bat?rev=748600&r1=748599&r2=748600&view=diff
==============================================================================
--- incubator/etch/branches/dynamo/scripts/compEtchFilesForJava.bat (original)
+++ incubator/etch/branches/dynamo/scripts/compEtchFilesForJava.bat Fri Feb 27 17:11:01 2009
@@ -60,7 +60,7 @@
 @pushd example\src\main\etch
 @call %x%scripts\etch-eclipse.bat %q% %b% %n% %d% %i%        Example.etch
 @call %x%scripts\etch-eclipse.bat %q% %b% %n% %d% %i%        Foo.etch
-@call %x%scripts\etch-eclipse.bat %q% %b% %n% %d% %i%        FooExample.etch
+@call %x%scripts\etch-eclipse.bat %q% %b% %n% %d% %i%        ExampleFoo.etch
 @popd
 
 @pushd perf\src\main\etch