diff options
Diffstat (limited to '')
-rw-r--r-- | sca-java-2.x/trunk/samples/learning-more/implementation-spring/helloworld-spring-contribution/src/main/java/sample/DateService.java (renamed from sca-java-2.x/trunk/samples/learning-more/implementation-spring/contribution-helloworld-spring/src/main/java/sample/DateService.java) | 0 | ||||
-rw-r--r-- | sca-java-2.x/trunk/samples/learning-more/implementation-spring/helloworld-spring-contribution/src/main/java/sample/DateServiceImpl.java (renamed from sca-java-2.x/trunk/samples/learning-more/implementation-spring/contribution-helloworld-spring/src/main/java/sample/DateServiceImpl.java) | 0 | ||||
-rw-r--r-- | sca-java-2.x/trunk/samples/learning-more/implementation-spring/helloworld-spring-contribution/src/main/java/sample/Helloworld.java (renamed from sca-java-2.x/trunk/samples/learning-more/implementation-spring/contribution-helloworld-spring/src/main/java/sample/Helloworld.java) | 0 | ||||
-rw-r--r-- | sca-java-2.x/trunk/samples/learning-more/implementation-spring/helloworld-spring-contribution/src/main/java/sample/HelloworldClientImpl.java (renamed from sca-java-2.x/trunk/samples/learning-more/implementation-spring/contribution-helloworld-spring/src/main/java/sample/HelloworldClientImpl.java) | 96 | ||||
-rw-r--r-- | sca-java-2.x/trunk/samples/learning-more/implementation-spring/helloworld-spring-contribution/src/main/java/sample/HelloworldImpl.java (renamed from sca-java-2.x/trunk/samples/learning-more/implementation-spring/contribution-helloworld-spring/src/main/java/sample/HelloworldImpl.java) | 0 | ||||
-rw-r--r-- | sca-java-2.x/trunk/samples/learning-more/implementation-spring/helloworld-spring-contribution/src/main/resources/META-INF/sca-contribution.xml (renamed from sca-java-2.x/trunk/samples/learning-more/implementation-spring/contribution-helloworld-spring/src/main/resources/META-INF/sca-contribution.xml) | 0 | ||||
-rw-r--r-- | sca-java-2.x/trunk/samples/learning-more/implementation-spring/helloworld-spring-contribution/src/main/resources/helloworld-client-context.xml (renamed from sca-java-2.x/trunk/samples/learning-more/implementation-spring/contribution-helloworld-spring/src/main/resources/helloworld-client-context.xml) | 72 | ||||
-rw-r--r-- | sca-java-2.x/trunk/samples/learning-more/implementation-spring/helloworld-spring-contribution/src/main/resources/helloworld-context.xml (renamed from sca-java-2.x/trunk/samples/learning-more/implementation-spring/contribution-helloworld-spring/src/main/resources/helloworld-context.xml) | 0 | ||||
-rw-r--r-- | sca-java-2.x/trunk/samples/learning-more/implementation-spring/helloworld-spring-contribution/src/main/resources/helloworld.composite (renamed from sca-java-2.x/trunk/samples/learning-more/implementation-spring/contribution-helloworld-spring/src/main/resources/helloworld.composite) | 0 |
9 files changed, 84 insertions, 84 deletions
diff --git a/sca-java-2.x/trunk/samples/learning-more/implementation-spring/contribution-helloworld-spring/src/main/java/sample/DateService.java b/sca-java-2.x/trunk/samples/learning-more/implementation-spring/helloworld-spring-contribution/src/main/java/sample/DateService.java index 7c50d66a9c..7c50d66a9c 100644 --- a/sca-java-2.x/trunk/samples/learning-more/implementation-spring/contribution-helloworld-spring/src/main/java/sample/DateService.java +++ b/sca-java-2.x/trunk/samples/learning-more/implementation-spring/helloworld-spring-contribution/src/main/java/sample/DateService.java diff --git a/sca-java-2.x/trunk/samples/learning-more/implementation-spring/contribution-helloworld-spring/src/main/java/sample/DateServiceImpl.java b/sca-java-2.x/trunk/samples/learning-more/implementation-spring/helloworld-spring-contribution/src/main/java/sample/DateServiceImpl.java index 64bdd86f7c..64bdd86f7c 100644 --- a/sca-java-2.x/trunk/samples/learning-more/implementation-spring/contribution-helloworld-spring/src/main/java/sample/DateServiceImpl.java +++ b/sca-java-2.x/trunk/samples/learning-more/implementation-spring/helloworld-spring-contribution/src/main/java/sample/DateServiceImpl.java diff --git a/sca-java-2.x/trunk/samples/learning-more/implementation-spring/contribution-helloworld-spring/src/main/java/sample/Helloworld.java b/sca-java-2.x/trunk/samples/learning-more/implementation-spring/helloworld-spring-contribution/src/main/java/sample/Helloworld.java index f4e8c50448..f4e8c50448 100644 --- a/sca-java-2.x/trunk/samples/learning-more/implementation-spring/contribution-helloworld-spring/src/main/java/sample/Helloworld.java +++ b/sca-java-2.x/trunk/samples/learning-more/implementation-spring/helloworld-spring-contribution/src/main/java/sample/Helloworld.java diff --git a/sca-java-2.x/trunk/samples/learning-more/implementation-spring/contribution-helloworld-spring/src/main/java/sample/HelloworldClientImpl.java b/sca-java-2.x/trunk/samples/learning-more/implementation-spring/helloworld-spring-contribution/src/main/java/sample/HelloworldClientImpl.java index a01aad9d88..ddcb1d9bc3 100644 --- a/sca-java-2.x/trunk/samples/learning-more/implementation-spring/contribution-helloworld-spring/src/main/java/sample/HelloworldClientImpl.java +++ b/sca-java-2.x/trunk/samples/learning-more/implementation-spring/helloworld-spring-contribution/src/main/java/sample/HelloworldClientImpl.java @@ -1,48 +1,48 @@ -/*
- * 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 sample;
-
-import org.oasisopen.sca.annotation.Reference;
-
-public class HelloworldClientImpl implements Helloworld {
- private Helloworld helloworld;
-
- // SCA reference
- @Reference(required = false)
- private DateService dateService;
-
- public HelloworldClientImpl() {
- System.out.println("HelloworldClientImpl()");
- }
-
- public String sayHello(String name) {
- System.out.println("HelloworldClientImpl.sayHello(" + name + ")");
- if (dateService == null) {
- return "Hello " + name;
- }
- return "[" + dateService.getDate() + "] " + helloworld.sayHello(name);
- }
-
- // Setter for spring injection
- public void setHelloworld(Helloworld helloworld) {
- System.out.println("Injected with " + helloworld);
- this.helloworld = helloworld;
- }
-
-}
+/* + * 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 sample; + +import org.oasisopen.sca.annotation.Reference; + +public class HelloworldClientImpl implements Helloworld { + private Helloworld helloworld; + + // SCA reference + @Reference(required = false) + private DateService dateService; + + public HelloworldClientImpl() { + System.out.println("HelloworldClientImpl()"); + } + + public String sayHello(String name) { + System.out.println("HelloworldClientImpl.sayHello(" + name + ")"); + if (dateService == null) { + return "Hello " + name; + } + return "[" + dateService.getDate() + "] " + helloworld.sayHello(name); + } + + // Setter for spring injection + public void setHelloworld(Helloworld helloworld) { + System.out.println("Injected with " + helloworld); + this.helloworld = helloworld; + } + +} diff --git a/sca-java-2.x/trunk/samples/learning-more/implementation-spring/contribution-helloworld-spring/src/main/java/sample/HelloworldImpl.java b/sca-java-2.x/trunk/samples/learning-more/implementation-spring/helloworld-spring-contribution/src/main/java/sample/HelloworldImpl.java index 125c333ddc..125c333ddc 100644 --- a/sca-java-2.x/trunk/samples/learning-more/implementation-spring/contribution-helloworld-spring/src/main/java/sample/HelloworldImpl.java +++ b/sca-java-2.x/trunk/samples/learning-more/implementation-spring/helloworld-spring-contribution/src/main/java/sample/HelloworldImpl.java diff --git a/sca-java-2.x/trunk/samples/learning-more/implementation-spring/contribution-helloworld-spring/src/main/resources/META-INF/sca-contribution.xml b/sca-java-2.x/trunk/samples/learning-more/implementation-spring/helloworld-spring-contribution/src/main/resources/META-INF/sca-contribution.xml index 552d100638..552d100638 100644 --- a/sca-java-2.x/trunk/samples/learning-more/implementation-spring/contribution-helloworld-spring/src/main/resources/META-INF/sca-contribution.xml +++ b/sca-java-2.x/trunk/samples/learning-more/implementation-spring/helloworld-spring-contribution/src/main/resources/META-INF/sca-contribution.xml diff --git a/sca-java-2.x/trunk/samples/learning-more/implementation-spring/contribution-helloworld-spring/src/main/resources/helloworld-client-context.xml b/sca-java-2.x/trunk/samples/learning-more/implementation-spring/helloworld-spring-contribution/src/main/resources/helloworld-client-context.xml index 0e30cfa582..15e9647bb0 100644 --- a/sca-java-2.x/trunk/samples/learning-more/implementation-spring/contribution-helloworld-spring/src/main/resources/helloworld-client-context.xml +++ b/sca-java-2.x/trunk/samples/learning-more/implementation-spring/helloworld-spring-contribution/src/main/resources/helloworld-client-context.xml @@ -1,37 +1,37 @@ -<?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.
--->
-<beans xmlns="http://www.springframework.org/schema/beans"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xmlns:sca="http://www.springframework.org/schema/sca"
- xsi:schemaLocation="
- http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
- http://www.springframework.org/schema/sca http://www.osoa.org/xmlns/sca/1.0/spring-sca.xsd">
-
- <bean id="HelloworldClientBean" class="sample.HelloworldClientImpl">
- <property name="helloworld">
- <ref bean="HelloworldBean"/>
- </property>
- </bean>
-
- <!--
- <sca:reference name="dateService" type="sample.DateService"/>
- -->
-
+<?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. +--> +<beans xmlns="http://www.springframework.org/schema/beans" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xmlns:sca="http://www.springframework.org/schema/sca" + xsi:schemaLocation=" + http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd + http://www.springframework.org/schema/sca http://www.osoa.org/xmlns/sca/1.0/spring-sca.xsd"> + + <bean id="HelloworldClientBean" class="sample.HelloworldClientImpl"> + <property name="helloworld"> + <ref bean="HelloworldBean"/> + </property> + </bean> + + <!-- + <sca:reference name="dateService" type="sample.DateService"/> + --> + </beans>
\ No newline at end of file diff --git a/sca-java-2.x/trunk/samples/learning-more/implementation-spring/contribution-helloworld-spring/src/main/resources/helloworld-context.xml b/sca-java-2.x/trunk/samples/learning-more/implementation-spring/helloworld-spring-contribution/src/main/resources/helloworld-context.xml index 9ecd09974e..9ecd09974e 100644 --- a/sca-java-2.x/trunk/samples/learning-more/implementation-spring/contribution-helloworld-spring/src/main/resources/helloworld-context.xml +++ b/sca-java-2.x/trunk/samples/learning-more/implementation-spring/helloworld-spring-contribution/src/main/resources/helloworld-context.xml diff --git a/sca-java-2.x/trunk/samples/learning-more/implementation-spring/contribution-helloworld-spring/src/main/resources/helloworld.composite b/sca-java-2.x/trunk/samples/learning-more/implementation-spring/helloworld-spring-contribution/src/main/resources/helloworld.composite index 6d356758ae..6d356758ae 100644 --- a/sca-java-2.x/trunk/samples/learning-more/implementation-spring/contribution-helloworld-spring/src/main/resources/helloworld.composite +++ b/sca-java-2.x/trunk/samples/learning-more/implementation-spring/helloworld-spring-contribution/src/main/resources/helloworld.composite |