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. git-svn-id: https://svn.apache.org/repos/asf/incubator/etch/branches/dynamo@748600 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/examples/example/src/main/java/org/apache/etch/examples/example/ImplExampleFooClient.java b/examples/example/src/main/java/org/apache/etch/examples/example/ImplExampleFooClient.java index ab00e62..8b563fa 100644 --- a/examples/example/src/main/java/org/apache/etch/examples/example/ImplExampleFooClient.java +++ b/examples/example/src/main/java/org/apache/etch/examples/example/ImplExampleFooClient.java
@@ -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;
diff --git a/examples/example/src/main/java/org/apache/etch/examples/example/ImplExampleFooServer.java b/examples/example/src/main/java/org/apache/etch/examples/example/ImplExampleFooServer.java index f0affe4..bcf9767 100644 --- a/examples/example/src/main/java/org/apache/etch/examples/example/ImplExampleFooServer.java +++ b/examples/example/src/main/java/org/apache/etch/examples/example/ImplExampleFooServer.java
@@ -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;
diff --git a/examples/example/src/main/java/org/apache/etch/examples/example/ImplFooClient.java b/examples/example/src/main/java/org/apache/etch/examples/example/ImplFooClient.java index 06ffd0c..71562c0 100644 --- a/examples/example/src/main/java/org/apache/etch/examples/example/ImplFooClient.java +++ b/examples/example/src/main/java/org/apache/etch/examples/example/ImplFooClient.java
@@ -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;
diff --git a/examples/example/src/main/java/org/apache/etch/examples/example/ImplFooServer.java b/examples/example/src/main/java/org/apache/etch/examples/example/ImplFooServer.java index 379134f..eca908f 100644 --- a/examples/example/src/main/java/org/apache/etch/examples/example/ImplFooServer.java +++ b/examples/example/src/main/java/org/apache/etch/examples/example/ImplFooServer.java
@@ -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;
diff --git a/examples/example/src/main/java/org/apache/etch/examples/example/MainExampleFooClient.java b/examples/example/src/main/java/org/apache/etch/examples/example/MainExampleFooClient.java index 6d5a62d..fc1b8ec 100644 --- a/examples/example/src/main/java/org/apache/etch/examples/example/MainExampleFooClient.java +++ b/examples/example/src/main/java/org/apache/etch/examples/example/MainExampleFooClient.java
@@ -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;
diff --git a/examples/example/src/main/java/org/apache/etch/examples/example/MainExampleFooListener.java b/examples/example/src/main/java/org/apache/etch/examples/example/MainExampleFooListener.java index 9788c5a..268432f 100644 --- a/examples/example/src/main/java/org/apache/etch/examples/example/MainExampleFooListener.java +++ b/examples/example/src/main/java/org/apache/etch/examples/example/MainExampleFooListener.java
@@ -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;
diff --git a/examples/example/src/main/java/org/apache/etch/examples/example/MainExampleListener.java b/examples/example/src/main/java/org/apache/etch/examples/example/MainExampleListener.java index 60f87a1..e3a855a 100644 --- a/examples/example/src/main/java/org/apache/etch/examples/example/MainExampleListener.java +++ b/examples/example/src/main/java/org/apache/etch/examples/example/MainExampleListener.java
@@ -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 );
diff --git a/examples/example/src/main/java/org/apache/etch/examples/example/MainFooClient.java b/examples/example/src/main/java/org/apache/etch/examples/example/MainFooClient.java index 58c7357..4da2ebd 100644 --- a/examples/example/src/main/java/org/apache/etch/examples/example/MainFooClient.java +++ b/examples/example/src/main/java/org/apache/etch/examples/example/MainFooClient.java
@@ -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;
diff --git a/examples/example/src/main/java/org/apache/etch/examples/example/MainFooListener.java b/examples/example/src/main/java/org/apache/etch/examples/example/MainFooListener.java index 7a5a8e4..50c3a7e 100644 --- a/examples/example/src/main/java/org/apache/etch/examples/example/MainFooListener.java +++ b/examples/example/src/main/java/org/apache/etch/examples/example/MainFooListener.java
@@ -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 ); + } }
diff --git a/scripts/compEtchFilesForJava.bat b/scripts/compEtchFilesForJava.bat index b0c0495..5a6ed14 100644 --- a/scripts/compEtchFilesForJava.bat +++ b/scripts/compEtchFilesForJava.bat
@@ -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