You are viewing a plain text version of this content. The canonical link for it is here.
Posted to xbean-scm@geronimo.apache.org by gn...@apache.org on 2012/10/03 10:38:37 UTC
svn commit: r1393346 [8/8] - in /geronimo/xbean/trunk: ./ maven-xbean-plugin/
maven-xbean-plugin/src/main/java/org/apache/xbean/maven/
xbean-asm-shaded/src/main/appended-resources/META-INF/ xbean-blueprint/
xbean-blueprint/src/main/java/org/apache/xbea...
Modified: geronimo/xbean/trunk/xbean-spring/src/test/resources/org/apache/xbean/spring/context/recipe-normal.xml
URL: http://svn.apache.org/viewvc/geronimo/xbean/trunk/xbean-spring/src/test/resources/org/apache/xbean/spring/context/recipe-normal.xml?rev=1393346&r1=1393345&r2=1393346&view=diff
==============================================================================
--- geronimo/xbean/trunk/xbean-spring/src/test/resources/org/apache/xbean/spring/context/recipe-normal.xml (original)
+++ geronimo/xbean/trunk/xbean-spring/src/test/resources/org/apache/xbean/spring/context/recipe-normal.xml Wed Oct 3 08:38:26 2012
@@ -1,42 +1,42 @@
-<?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.
-
--->
-<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN//EN" "http://www.springframework.org/dtd/spring-beans.dtd">
-<beans>
- <bean id="recipeService" class="org.apache.xbean.spring.example.RecipeService">
- <property name="recipes">
- <list>
- <bean class="org.apache.xbean.spring.example.Recipe">
- <property name="instructions" value="Mash together" />
- <property name="ingredients" value="Food" />
- </bean>
- <bean class="org.apache.xbean.spring.example.Recipe">
- <property name="instructions" value="Mash together" />
- <property name="ingredients" value="Food" />
- </bean>
- </list>
- </property>
- <property name="topRecipe">
- <bean class="org.apache.xbean.spring.example.Recipe">
- <property name="instructions" value="Mash together" />
- <property name="ingredients" value="Food" />
- </bean>
- </property>
- </bean>
-</beans>
+<?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.
+
+-->
+<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN//EN" "http://www.springframework.org/dtd/spring-beans.dtd">
+<beans>
+ <bean id="recipeService" class="org.apache.xbean.spring.example.RecipeService">
+ <property name="recipes">
+ <list>
+ <bean class="org.apache.xbean.spring.example.Recipe">
+ <property name="instructions" value="Mash together" />
+ <property name="ingredients" value="Food" />
+ </bean>
+ <bean class="org.apache.xbean.spring.example.Recipe">
+ <property name="instructions" value="Mash together" />
+ <property name="ingredients" value="Food" />
+ </bean>
+ </list>
+ </property>
+ <property name="topRecipe">
+ <bean class="org.apache.xbean.spring.example.Recipe">
+ <property name="instructions" value="Mash together" />
+ <property name="ingredients" value="Food" />
+ </bean>
+ </property>
+ </bean>
+</beans>
Propchange: geronimo/xbean/trunk/xbean-spring/src/test/resources/org/apache/xbean/spring/context/recipe-normal.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: geronimo/xbean/trunk/xbean-spring/src/test/resources/org/apache/xbean/spring/context/recipe-xbean-mixed.xml
------------------------------------------------------------------------------
svn:eol-style = native
Modified: geronimo/xbean/trunk/xbean-spring/src/test/resources/org/apache/xbean/spring/context/recipe-xbean.xml
URL: http://svn.apache.org/viewvc/geronimo/xbean/trunk/xbean-spring/src/test/resources/org/apache/xbean/spring/context/recipe-xbean.xml?rev=1393346&r1=1393345&r2=1393346&view=diff
==============================================================================
--- geronimo/xbean/trunk/xbean-spring/src/test/resources/org/apache/xbean/spring/context/recipe-xbean.xml (original)
+++ geronimo/xbean/trunk/xbean-spring/src/test/resources/org/apache/xbean/spring/context/recipe-xbean.xml Wed Oct 3 08:38:26 2012
@@ -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:x="http://xbean.apache.org/schemas/pizza" xmlns:foo="urn:foo">
-
- <x:recipe-service id="recipeService">
- <x:topRecipe>
- <x:instructions>Mash together</x:instructions>
- <x:ingredients>Food</x:ingredients>
- </x:topRecipe>
- <x:recipe>
- <x:instructions>Mash together</x:instructions>
- <x:ingredients>Food</x:ingredients>
- </x:recipe>
- <x:recipe>
- <x:instructions>Mash together</x:instructions>
- <x:ingredients>Food</x:ingredients>
- </x:recipe>
- </x:recipe-service>
-
-</beans>
+<?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:x="http://xbean.apache.org/schemas/pizza" xmlns:foo="urn:foo">
+
+ <x:recipe-service id="recipeService">
+ <x:topRecipe>
+ <x:instructions>Mash together</x:instructions>
+ <x:ingredients>Food</x:ingredients>
+ </x:topRecipe>
+ <x:recipe>
+ <x:instructions>Mash together</x:instructions>
+ <x:ingredients>Food</x:ingredients>
+ </x:recipe>
+ <x:recipe>
+ <x:instructions>Mash together</x:instructions>
+ <x:ingredients>Food</x:ingredients>
+ </x:recipe>
+ </x:recipe-service>
+
+</beans>
Propchange: geronimo/xbean/trunk/xbean-spring/src/test/resources/org/apache/xbean/spring/context/recipe-xbean.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: geronimo/xbean/trunk/xbean-spring/src/test/resources/org/apache/xbean/spring/context/restaurant-normal.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: geronimo/xbean/trunk/xbean-spring/src/test/resources/org/apache/xbean/spring/context/restaurant-spring-extended.xml
------------------------------------------------------------------------------
svn:eol-style = native
Modified: geronimo/xbean/trunk/xbean-spring/src/test/resources/org/apache/xbean/spring/context/restaurant-xbean-mixed.xml
URL: http://svn.apache.org/viewvc/geronimo/xbean/trunk/xbean-spring/src/test/resources/org/apache/xbean/spring/context/restaurant-xbean-mixed.xml?rev=1393346&r1=1393345&r2=1393346&view=diff
==============================================================================
--- geronimo/xbean/trunk/xbean-spring/src/test/resources/org/apache/xbean/spring/context/restaurant-xbean-mixed.xml (original)
+++ geronimo/xbean/trunk/xbean-spring/src/test/resources/org/apache/xbean/spring/context/restaurant-xbean-mixed.xml Wed Oct 3 08:38:26 2012
@@ -1,56 +1,56 @@
-<?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.
-
--->
-<!-- START SNIPPET: xml -->
-<beans xmlns:foo="http://acme.com">
-
- <restaurant id="restaurant" xmlns="http://xbean.apache.org/schemas/pizza"
- serviceName="foo:xyz">
- <dinnerMenu>
- <pizza myTopping="Ham" cheese="Mozzarella" size="15"/>
- <bean xmlns="http://www.springframework.org/schema/beans" class="org.apache.xbean.spring.example.PizzaService">
- <property name="topping" value="Eggs"/>
- <property name="cheese" value="Mozzarella"/>
- <property name="size" value="16"/>
- </bean>
- </dinnerMenu>
-
- <snackMenu>
- <pizza myTopping="Tofu" cheese="Parmesan" size="6"/>
- <pizza myTopping="Prosciutto" cheese="Blue" size="8"/>
- </snackMenu>
-
- <lunchMenu>
- <bean xmlns="" class="org.apache.xbean.spring.example.PizzaService">
- <property name="topping" value="Chicken"/>
- <property name="cheese" value="Brie"/>
- <property name="size" value="17"/>
- </bean>
- </lunchMenu>
-
- <favourite>
- <bean xmlns="http://xbean.apache.org/schemas/spring/1.0" class="org.apache.xbean.spring.example.PizzaService">
- <property name="topping" value="Salami"/>
- <property name="cheese" value="Edam"/>
- <property name="size" value="17"/>
- </bean>
- </favourite>
- </restaurant>
-</beans>
-<!-- END SNIPPET: xml -->
+<?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.
+
+-->
+<!-- START SNIPPET: xml -->
+<beans xmlns:foo="http://acme.com">
+
+ <restaurant id="restaurant" xmlns="http://xbean.apache.org/schemas/pizza"
+ serviceName="foo:xyz">
+ <dinnerMenu>
+ <pizza myTopping="Ham" cheese="Mozzarella" size="15"/>
+ <bean xmlns="http://www.springframework.org/schema/beans" class="org.apache.xbean.spring.example.PizzaService">
+ <property name="topping" value="Eggs"/>
+ <property name="cheese" value="Mozzarella"/>
+ <property name="size" value="16"/>
+ </bean>
+ </dinnerMenu>
+
+ <snackMenu>
+ <pizza myTopping="Tofu" cheese="Parmesan" size="6"/>
+ <pizza myTopping="Prosciutto" cheese="Blue" size="8"/>
+ </snackMenu>
+
+ <lunchMenu>
+ <bean xmlns="" class="org.apache.xbean.spring.example.PizzaService">
+ <property name="topping" value="Chicken"/>
+ <property name="cheese" value="Brie"/>
+ <property name="size" value="17"/>
+ </bean>
+ </lunchMenu>
+
+ <favourite>
+ <bean xmlns="http://xbean.apache.org/schemas/spring/1.0" class="org.apache.xbean.spring.example.PizzaService">
+ <property name="topping" value="Salami"/>
+ <property name="cheese" value="Edam"/>
+ <property name="size" value="17"/>
+ </bean>
+ </favourite>
+ </restaurant>
+</beans>
+<!-- END SNIPPET: xml -->
Propchange: geronimo/xbean/trunk/xbean-spring/src/test/resources/org/apache/xbean/spring/context/restaurant-xbean-mixed.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: geronimo/xbean/trunk/xbean-spring/src/test/resources/org/apache/xbean/spring/context/restaurant-xbean-root.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: geronimo/xbean/trunk/xbean-spring/src/test/resources/org/apache/xbean/spring/context/restaurant-xbean-simple.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: geronimo/xbean/trunk/xbean-spring/src/test/resources/org/apache/xbean/spring/context/restaurant-xbean.xml
------------------------------------------------------------------------------
svn:eol-style = native
Modified: geronimo/xbean/trunk/xbean-spring/src/test/resources/org/apache/xbean/spring/context/salad-normal.xml
URL: http://svn.apache.org/viewvc/geronimo/xbean/trunk/xbean-spring/src/test/resources/org/apache/xbean/spring/context/salad-normal.xml?rev=1393346&r1=1393345&r2=1393346&view=diff
==============================================================================
--- geronimo/xbean/trunk/xbean-spring/src/test/resources/org/apache/xbean/spring/context/salad-normal.xml (original)
+++ geronimo/xbean/trunk/xbean-spring/src/test/resources/org/apache/xbean/spring/context/salad-normal.xml Wed Oct 3 08:38:26 2012
@@ -1,29 +1,29 @@
-<?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.
-
--->
-<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN//EN" "http://www.springframework.org/dtd/spring-beans.dtd">
-<beans>
-
- <bean id="saladService" class="org.apache.xbean.spring.example.SaladService">
- <constructor-arg index="0" value="Cesar"/>
- <constructor-arg index="1" value="Small"/>
- <constructor-arg index="2" value="true"/>
- </bean>
-
-</beans>
+<?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.
+
+-->
+<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN//EN" "http://www.springframework.org/dtd/spring-beans.dtd">
+<beans>
+
+ <bean id="saladService" class="org.apache.xbean.spring.example.SaladService">
+ <constructor-arg index="0" value="Cesar"/>
+ <constructor-arg index="1" value="Small"/>
+ <constructor-arg index="2" value="true"/>
+ </bean>
+
+</beans>
Propchange: geronimo/xbean/trunk/xbean-spring/src/test/resources/org/apache/xbean/spring/context/salad-normal.xml
------------------------------------------------------------------------------
svn:eol-style = native
Modified: geronimo/xbean/trunk/xbean-spring/src/test/resources/org/apache/xbean/spring/context/salad-xbean.xml
URL: http://svn.apache.org/viewvc/geronimo/xbean/trunk/xbean-spring/src/test/resources/org/apache/xbean/spring/context/salad-xbean.xml?rev=1393346&r1=1393345&r2=1393346&view=diff
==============================================================================
--- geronimo/xbean/trunk/xbean-spring/src/test/resources/org/apache/xbean/spring/context/salad-xbean.xml (original)
+++ geronimo/xbean/trunk/xbean-spring/src/test/resources/org/apache/xbean/spring/context/salad-xbean.xml Wed Oct 3 08:38:26 2012
@@ -1,27 +1,27 @@
-<?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.
-
--->
-<!-- START SNIPPET: xml -->
-<beans xmlns:s="http://xbean.apache.org/schemas/salad">
-
- <s:salad id="saladService" dressing="Cesar" size="Small" addCroutons="true"/>
-
-</beans>
-<!-- END SNIPPET: xml -->
-
+<?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.
+
+-->
+<!-- START SNIPPET: xml -->
+<beans xmlns:s="http://xbean.apache.org/schemas/salad">
+
+ <s:salad id="saladService" dressing="Cesar" size="Small" addCroutons="true"/>
+
+</beans>
+<!-- END SNIPPET: xml -->
+
Propchange: geronimo/xbean/trunk/xbean-spring/src/test/resources/org/apache/xbean/spring/context/salad-xbean.xml
------------------------------------------------------------------------------
svn:eol-style = native
Modified: geronimo/xbean/trunk/xbean-spring/src/test/resources/org/apache/xbean/spring/context/socket-address-normal.xml
URL: http://svn.apache.org/viewvc/geronimo/xbean/trunk/xbean-spring/src/test/resources/org/apache/xbean/spring/context/socket-address-normal.xml?rev=1393346&r1=1393345&r2=1393346&view=diff
==============================================================================
--- geronimo/xbean/trunk/xbean-spring/src/test/resources/org/apache/xbean/spring/context/socket-address-normal.xml (original)
+++ geronimo/xbean/trunk/xbean-spring/src/test/resources/org/apache/xbean/spring/context/socket-address-normal.xml Wed Oct 3 08:38:26 2012
@@ -1,41 +1,41 @@
-<?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.
-
--->
-<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN//EN" "http://www.springframework.org/dtd/spring-beans.dtd">
-<beans>
-
- <bean id="socketAddress" class="org.apache.xbean.spring.example.SocketAddressFactory" factory-method="create">
- <constructor-arg index="0" value="localhost"/>
- </bean>
-
- <bean id="socketService" class="org.apache.xbean.spring.example.SocketService">
- <property name="addresses">
- <list>
- <bean class="org.apache.xbean.spring.example.SocketAddressFactory" factory-method="create">
- <constructor-arg index="0" value="localhost"/>
- </bean>
- <bean class="org.apache.xbean.spring.example.SocketAddressFactory" factory-method="create">
- <constructor-arg index="0" value="localhost"/>
- </bean>
- </list>
- </property>
- </bean>
-
-
-</beans>
+<?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.
+
+-->
+<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN//EN" "http://www.springframework.org/dtd/spring-beans.dtd">
+<beans>
+
+ <bean id="socketAddress" class="org.apache.xbean.spring.example.SocketAddressFactory" factory-method="create">
+ <constructor-arg index="0" value="localhost"/>
+ </bean>
+
+ <bean id="socketService" class="org.apache.xbean.spring.example.SocketService">
+ <property name="addresses">
+ <list>
+ <bean class="org.apache.xbean.spring.example.SocketAddressFactory" factory-method="create">
+ <constructor-arg index="0" value="localhost"/>
+ </bean>
+ <bean class="org.apache.xbean.spring.example.SocketAddressFactory" factory-method="create">
+ <constructor-arg index="0" value="localhost"/>
+ </bean>
+ </list>
+ </property>
+ </bean>
+
+
+</beans>
Propchange: geronimo/xbean/trunk/xbean-spring/src/test/resources/org/apache/xbean/spring/context/socket-address-normal.xml
------------------------------------------------------------------------------
svn:eol-style = native
Modified: geronimo/xbean/trunk/xbean-spring/src/test/resources/org/apache/xbean/spring/context/socket-address.xml
URL: http://svn.apache.org/viewvc/geronimo/xbean/trunk/xbean-spring/src/test/resources/org/apache/xbean/spring/context/socket-address.xml?rev=1393346&r1=1393345&r2=1393346&view=diff
==============================================================================
--- geronimo/xbean/trunk/xbean-spring/src/test/resources/org/apache/xbean/spring/context/socket-address.xml (original)
+++ geronimo/xbean/trunk/xbean-spring/src/test/resources/org/apache/xbean/spring/context/socket-address.xml Wed Oct 3 08:38:26 2012
@@ -1,32 +1,32 @@
-<?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.
-
--->
-<!-- START SNIPPET: xml -->
-<beans xmlns:b="http://xbean.apache.org/schemas/pizza">
- <b:socketAddress id="socketAddress">localhost</b:socketAddress>
-
- <b:socketService id="socketService">
- <addresses>
- <b:socketAddress>localhost</b:socketAddress>
- <b:socketAddress>localhost</b:socketAddress>
- </addresses>
- </b:socketService>
-</beans>
-<!-- END SNIPPET: xml -->
-
+<?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.
+
+-->
+<!-- START SNIPPET: xml -->
+<beans xmlns:b="http://xbean.apache.org/schemas/pizza">
+ <b:socketAddress id="socketAddress">localhost</b:socketAddress>
+
+ <b:socketService id="socketService">
+ <addresses>
+ <b:socketAddress>localhost</b:socketAddress>
+ <b:socketAddress>localhost</b:socketAddress>
+ </addresses>
+ </b:socketService>
+</beans>
+<!-- END SNIPPET: xml -->
+
Propchange: geronimo/xbean/trunk/xbean-spring/src/test/resources/org/apache/xbean/spring/context/socket-address.xml
------------------------------------------------------------------------------
svn:eol-style = native
Modified: geronimo/xbean/trunk/xbean-spring/src/test/resources/org/apache/xbean/spring/context/soup-normal.xml
URL: http://svn.apache.org/viewvc/geronimo/xbean/trunk/xbean-spring/src/test/resources/org/apache/xbean/spring/context/soup-normal.xml?rev=1393346&r1=1393345&r2=1393346&view=diff
==============================================================================
--- geronimo/xbean/trunk/xbean-spring/src/test/resources/org/apache/xbean/spring/context/soup-normal.xml (original)
+++ geronimo/xbean/trunk/xbean-spring/src/test/resources/org/apache/xbean/spring/context/soup-normal.xml Wed Oct 3 08:38:26 2012
@@ -1,31 +1,31 @@
-<?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.
-
--->
-<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN//EN" "http://www.springframework.org/dtd/spring-beans.dtd">
-<beans>
-
- <bean id="soupService" name="nestedBean, nestedValue" class="org.apache.xbean.spring.example.SoupService"
- init-method="make"
- destroy-method="eat"
- factory-method="newSoup"
- >
- <constructor-arg index="0" value="French Onion"/>
- </bean>
-
-</beans>
+<?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.
+
+-->
+<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN//EN" "http://www.springframework.org/dtd/spring-beans.dtd">
+<beans>
+
+ <bean id="soupService" name="nestedBean, nestedValue" class="org.apache.xbean.spring.example.SoupService"
+ init-method="make"
+ destroy-method="eat"
+ factory-method="newSoup"
+ >
+ <constructor-arg index="0" value="French Onion"/>
+ </bean>
+
+</beans>
Propchange: geronimo/xbean/trunk/xbean-spring/src/test/resources/org/apache/xbean/spring/context/soup-normal.xml
------------------------------------------------------------------------------
svn:eol-style = native
Modified: geronimo/xbean/trunk/xbean-spring/src/test/resources/org/apache/xbean/spring/context/soup-xbean.xml
URL: http://svn.apache.org/viewvc/geronimo/xbean/trunk/xbean-spring/src/test/resources/org/apache/xbean/spring/context/soup-xbean.xml?rev=1393346&r1=1393345&r2=1393346&view=diff
==============================================================================
--- geronimo/xbean/trunk/xbean-spring/src/test/resources/org/apache/xbean/spring/context/soup-xbean.xml (original)
+++ geronimo/xbean/trunk/xbean-spring/src/test/resources/org/apache/xbean/spring/context/soup-xbean.xml Wed Oct 3 08:38:26 2012
@@ -1,40 +1,40 @@
-<?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.
-
--->
-<!-- START SNIPPET: xml -->
-<beans xmlns:s="http://xbean.apache.org/schemas/soup">
-
- <s:soup id="soupService" type="French Onion"/>
-
- <s:soup id="nestedBean">
- <s:type>
- <bean class="java.lang.String">
- <constructor-arg index="0" value="French Onion"/>
- </bean>
- </s:type>
- </s:soup>
-
- <s:soup id="nestedValue">
- <s:type>
- <value>French Onion</value>
- </s:type>
- </s:soup>
-</beans>
-<!-- END SNIPPET: xml -->
-
+<?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.
+
+-->
+<!-- START SNIPPET: xml -->
+<beans xmlns:s="http://xbean.apache.org/schemas/soup">
+
+ <s:soup id="soupService" type="French Onion"/>
+
+ <s:soup id="nestedBean">
+ <s:type>
+ <bean class="java.lang.String">
+ <constructor-arg index="0" value="French Onion"/>
+ </bean>
+ </s:type>
+ </s:soup>
+
+ <s:soup id="nestedValue">
+ <s:type>
+ <value>French Onion</value>
+ </s:type>
+ </s:soup>
+</beans>
+<!-- END SNIPPET: xml -->
+
Propchange: geronimo/xbean/trunk/xbean-spring/src/test/resources/org/apache/xbean/spring/context/soup-xbean.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: geronimo/xbean/trunk/xbean-spring/src/test/resources/org/apache/xbean/spring/context/spring-extension.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: geronimo/xbean/trunk/xbean-spring/src/test/resources/org/apache/xbean/spring/context/vodka-normal.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: geronimo/xbean/trunk/xbean-spring/src/test/resources/org/apache/xbean/spring/context/vodka-xbean.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: geronimo/xbean/trunk/xbean-spring/src/test/resources/org/apache/xbean/spring/context/wine-normal.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: geronimo/xbean/trunk/xbean-spring/src/test/resources/org/apache/xbean/spring/context/wine-xbean.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: geronimo/xbean/trunk/xbean-spring/src/test/resources/org/apache/xbean/spring/generator/model-test-xsd-validation.xml
------------------------------------------------------------------------------
svn:eol-style = native
Modified: geronimo/xbean/trunk/xbean-spring/src/test/resources/org/apache/xbean/spring/jndi/jndi.xml
URL: http://svn.apache.org/viewvc/geronimo/xbean/trunk/xbean-spring/src/test/resources/org/apache/xbean/spring/jndi/jndi.xml?rev=1393346&r1=1393345&r2=1393346&view=diff
==============================================================================
--- geronimo/xbean/trunk/xbean-spring/src/test/resources/org/apache/xbean/spring/jndi/jndi.xml (original)
+++ geronimo/xbean/trunk/xbean-spring/src/test/resources/org/apache/xbean/spring/jndi/jndi.xml Wed Oct 3 08:38:26 2012
@@ -1,47 +1,47 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements. See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance with
- the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
-
--->
-<!-- START SNIPPET: jndi -->
-<beans>
- <bean id="jndi" class="org.apache.xbean.spring.jndi.DefaultContext" singleton="true">
- <property name="entries">
- <map>
- <entry key="test/restaurant">
-
- <restaurant id="restaurant" xmlns="http://xbean.apache.org/schemas/pizza" xmlns:foo="http://acme.com" serviceName="foo:xyz" uri="http://cheese.com">
- <dinnerMenu>
- <pizza myTopping="Ham" cheese="Mozzarella" size="15"/>
- <pizza myTopping="Eggs" cheese="Mozzarella" size="16"/>
- </dinnerMenu>
-
- <lunchMenu>
- <pizza myTopping="Chicken" cheese="Brie" size="17"/>
- </lunchMenu>
-
- <favourite>
- <pizza myTopping="Salami" cheese="Edam" size="17"/>
- </favourite>
- </restaurant>
-
- </entry>
- </map>
- </property>
- </bean>
-</beans>
-<!-- END SNIPPET: jndi -->
+<?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.
+
+-->
+<!-- START SNIPPET: jndi -->
+<beans>
+ <bean id="jndi" class="org.apache.xbean.spring.jndi.DefaultContext" singleton="true">
+ <property name="entries">
+ <map>
+ <entry key="test/restaurant">
+
+ <restaurant id="restaurant" xmlns="http://xbean.apache.org/schemas/pizza" xmlns:foo="http://acme.com" serviceName="foo:xyz" uri="http://cheese.com">
+ <dinnerMenu>
+ <pizza myTopping="Ham" cheese="Mozzarella" size="15"/>
+ <pizza myTopping="Eggs" cheese="Mozzarella" size="16"/>
+ </dinnerMenu>
+
+ <lunchMenu>
+ <pizza myTopping="Chicken" cheese="Brie" size="17"/>
+ </lunchMenu>
+
+ <favourite>
+ <pizza myTopping="Salami" cheese="Edam" size="17"/>
+ </favourite>
+ </restaurant>
+
+ </entry>
+ </map>
+ </property>
+ </bean>
+</beans>
+<!-- END SNIPPET: jndi -->
Propchange: geronimo/xbean/trunk/xbean-spring/src/test/resources/org/apache/xbean/spring/jndi/jndi.xml
------------------------------------------------------------------------------
svn:eol-style = native
Modified: geronimo/xbean/trunk/xbean-spring/src/test/resources/org/apache/xbean/spring/jndi/spring.xml
URL: http://svn.apache.org/viewvc/geronimo/xbean/trunk/xbean-spring/src/test/resources/org/apache/xbean/spring/jndi/spring.xml?rev=1393346&r1=1393345&r2=1393346&view=diff
==============================================================================
--- geronimo/xbean/trunk/xbean-spring/src/test/resources/org/apache/xbean/spring/jndi/spring.xml (original)
+++ geronimo/xbean/trunk/xbean-spring/src/test/resources/org/apache/xbean/spring/jndi/spring.xml Wed Oct 3 08:38:26 2012
@@ -1,45 +1,45 @@
-<?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>
-
- <restaurant id="restaurant" xmlns="http://xbean.apache.org/schemas/pizza" xmlns:foo="http://acme.com" serviceName="foo:xyz" uri="http://cheese.com">
- <dinnerMenu>
- <pizza myTopping="Ham" cheese="Mozzarella" size="15"/>
- <pizza myTopping="Eggs" cheese="Mozzarella" size="16"/>
- </dinnerMenu>
-
- <lunchMenu>
- <pizza myTopping="Chicken" cheese="Brie" size="17"/>
- </lunchMenu>
-
- <favourite>
- <pizza myTopping="Salami" cheese="Edam" size="17"/>
- </favourite>
- </restaurant>
-
- <!-- lets initialise JNDI here -->
- <bean id="jndi" class="org.apache.xbean.spring.jndi.SpringInitialContextFactory" factory-method="makeInitialContext" singleton="true">
- <property name="entries">
- <map>
- <entry key="test/restaurant" value-ref="restaurant" />
- </map>
- </property>
- </bean>
-</beans>
+<?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>
+
+ <restaurant id="restaurant" xmlns="http://xbean.apache.org/schemas/pizza" xmlns:foo="http://acme.com" serviceName="foo:xyz" uri="http://cheese.com">
+ <dinnerMenu>
+ <pizza myTopping="Ham" cheese="Mozzarella" size="15"/>
+ <pizza myTopping="Eggs" cheese="Mozzarella" size="16"/>
+ </dinnerMenu>
+
+ <lunchMenu>
+ <pizza myTopping="Chicken" cheese="Brie" size="17"/>
+ </lunchMenu>
+
+ <favourite>
+ <pizza myTopping="Salami" cheese="Edam" size="17"/>
+ </favourite>
+ </restaurant>
+
+ <!-- lets initialise JNDI here -->
+ <bean id="jndi" class="org.apache.xbean.spring.jndi.SpringInitialContextFactory" factory-method="makeInitialContext" singleton="true">
+ <property name="entries">
+ <map>
+ <entry key="test/restaurant" value-ref="restaurant" />
+ </map>
+ </property>
+ </bean>
+</beans>
Propchange: geronimo/xbean/trunk/xbean-spring/src/test/resources/org/apache/xbean/spring/jndi/spring.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: geronimo/xbean/trunk/xbean-telnet/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: geronimo/xbean/trunk/xbean-telnet/src/main/java/org/apache/xbean/command/Command.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: geronimo/xbean/trunk/xbean-telnet/src/main/java/org/apache/xbean/command/CommandRegistry.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: geronimo/xbean/trunk/xbean-telnet/src/main/java/org/apache/xbean/command/CommandShell.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: geronimo/xbean/trunk/xbean-telnet/src/main/java/org/apache/xbean/command/Exit.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: geronimo/xbean/trunk/xbean-telnet/src/main/java/org/apache/xbean/command/GroovySh.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: geronimo/xbean/trunk/xbean-telnet/src/main/java/org/apache/xbean/command/Help.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: geronimo/xbean/trunk/xbean-telnet/src/main/java/org/apache/xbean/command/Lookup.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: geronimo/xbean/trunk/xbean-telnet/src/main/java/org/apache/xbean/command/Test.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: geronimo/xbean/trunk/xbean-telnet/src/main/java/org/apache/xbean/command/Version.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: geronimo/xbean/trunk/xbean-telnet/src/main/java/org/apache/xbean/terminal/console/Main.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: geronimo/xbean/trunk/xbean-telnet/src/main/java/org/apache/xbean/terminal/telnet/TelnetCodes.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: geronimo/xbean/trunk/xbean-telnet/src/main/java/org/apache/xbean/terminal/telnet/TelnetDaemon.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: geronimo/xbean/trunk/xbean-telnet/src/main/java/org/apache/xbean/terminal/telnet/TelnetInputStream.java
------------------------------------------------------------------------------
svn:eol-style = native
Modified: geronimo/xbean/trunk/xbean-telnet/src/main/java/org/apache/xbean/terminal/telnet/TelnetOption.java
URL: http://svn.apache.org/viewvc/geronimo/xbean/trunk/xbean-telnet/src/main/java/org/apache/xbean/terminal/telnet/TelnetOption.java?rev=1393346&r1=1393345&r2=1393346&view=diff
==============================================================================
--- geronimo/xbean/trunk/xbean-telnet/src/main/java/org/apache/xbean/terminal/telnet/TelnetOption.java (original)
+++ geronimo/xbean/trunk/xbean-telnet/src/main/java/org/apache/xbean/terminal/telnet/TelnetOption.java Wed Oct 3 08:38:26 2012
@@ -1,69 +1,69 @@
-/**
- * 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.xbean.terminal.telnet;
-
-public class TelnetOption {
-
- private int optionCode;
- private boolean supported;
- private boolean enabled;
- private boolean negotiated;
- private boolean inNegotiation;
-
- public TelnetOption(int optionCode) {
- this.optionCode = optionCode;
- }
-
- public int getOptionId() {
- return optionCode;
- }
-
- public boolean isEnabled() {
- return enabled;
- }
-
- public void enable() {
- enabled = true;
- negotiated = true;
- }
-
- public void disable() {
- enabled = false;
- negotiated = true;
- }
-
- public boolean isSupported() {
- return supported;
- }
-
- public boolean isInNegotiation() {
- return inNegotiation;
- }
-
- public void isInNegotiation(boolean inNegotiation) {
- this.inNegotiation = inNegotiation;
- }
-
- public boolean hasBeenNegotiated() {
- return negotiated;
- }
-
- public void hasBeenNegotiated(boolean negotiated) {
- this.negotiated = negotiated;
- this.inNegotiation = false;
- }
-}
+/**
+ * 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.xbean.terminal.telnet;
+
+public class TelnetOption {
+
+ private int optionCode;
+ private boolean supported;
+ private boolean enabled;
+ private boolean negotiated;
+ private boolean inNegotiation;
+
+ public TelnetOption(int optionCode) {
+ this.optionCode = optionCode;
+ }
+
+ public int getOptionId() {
+ return optionCode;
+ }
+
+ public boolean isEnabled() {
+ return enabled;
+ }
+
+ public void enable() {
+ enabled = true;
+ negotiated = true;
+ }
+
+ public void disable() {
+ enabled = false;
+ negotiated = true;
+ }
+
+ public boolean isSupported() {
+ return supported;
+ }
+
+ public boolean isInNegotiation() {
+ return inNegotiation;
+ }
+
+ public void isInNegotiation(boolean inNegotiation) {
+ this.inNegotiation = inNegotiation;
+ }
+
+ public boolean hasBeenNegotiated() {
+ return negotiated;
+ }
+
+ public void hasBeenNegotiated(boolean negotiated) {
+ this.negotiated = negotiated;
+ this.inNegotiation = false;
+ }
+}
Propchange: geronimo/xbean/trunk/xbean-telnet/src/main/java/org/apache/xbean/terminal/telnet/TelnetOption.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: geronimo/xbean/trunk/xbean-telnet/src/main/java/org/apache/xbean/terminal/telnet/TelnetPrintStream.java
------------------------------------------------------------------------------
svn:eol-style = native
Modified: geronimo/xbean/trunk/xbean-telnet/src/main/java/org/apache/xbean/terminal/telnet/TelnetShell.java
URL: http://svn.apache.org/viewvc/geronimo/xbean/trunk/xbean-telnet/src/main/java/org/apache/xbean/terminal/telnet/TelnetShell.java?rev=1393346&r1=1393345&r2=1393346&view=diff
==============================================================================
--- geronimo/xbean/trunk/xbean-telnet/src/main/java/org/apache/xbean/terminal/telnet/TelnetShell.java (original)
+++ geronimo/xbean/trunk/xbean-telnet/src/main/java/org/apache/xbean/terminal/telnet/TelnetShell.java Wed Oct 3 08:38:26 2012
@@ -1,73 +1,73 @@
-/**
- * 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.xbean.terminal.telnet;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.io.PrintStream;
-import java.net.Socket;
-
-import org.apache.xbean.command.CommandShell;
-
-public class TelnetShell {
-
- private final String serverName;
-
- public TelnetShell(String serverName) {
- this.serverName = serverName;
- }
-
- public void service(Socket socket) throws IOException {
-
- try {
- service(socket.getInputStream(), socket.getOutputStream());
- } catch (IOException e) {
- e.printStackTrace();
- } finally {
- if (socket != null) socket.close();
- }
- }
-
- public void service(InputStream in, OutputStream out) throws IOException {
- InputStream telnetIn = null;
- PrintStream telnetOut = null;
- try {
- telnetIn = new TelnetInputStream(in, out);
- telnetOut = new TelnetPrintStream(out);
-
- telnetOut.println(serverName + " Console");
- telnetOut.println("type \'help\' for a list of commands");
-
- // TODO:1: Login
- //...need a security service first
-
- CommandShell shell = new CommandShell(serverName);
- shell.main(new String[]{}, telnetIn, telnetOut);
-
- } catch (Throwable t) {
- // TODO: log this
- } finally {
- if (telnetIn != null){
- telnetIn.close();
- }
- if (telnetOut != null) {
- telnetOut.close();
- }
- }
- }
-}
+/**
+ * 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.xbean.terminal.telnet;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.io.PrintStream;
+import java.net.Socket;
+
+import org.apache.xbean.command.CommandShell;
+
+public class TelnetShell {
+
+ private final String serverName;
+
+ public TelnetShell(String serverName) {
+ this.serverName = serverName;
+ }
+
+ public void service(Socket socket) throws IOException {
+
+ try {
+ service(socket.getInputStream(), socket.getOutputStream());
+ } catch (IOException e) {
+ e.printStackTrace();
+ } finally {
+ if (socket != null) socket.close();
+ }
+ }
+
+ public void service(InputStream in, OutputStream out) throws IOException {
+ InputStream telnetIn = null;
+ PrintStream telnetOut = null;
+ try {
+ telnetIn = new TelnetInputStream(in, out);
+ telnetOut = new TelnetPrintStream(out);
+
+ telnetOut.println(serverName + " Console");
+ telnetOut.println("type \'help\' for a list of commands");
+
+ // TODO:1: Login
+ //...need a security service first
+
+ CommandShell shell = new CommandShell(serverName);
+ shell.main(new String[]{}, telnetIn, telnetOut);
+
+ } catch (Throwable t) {
+ // TODO: log this
+ } finally {
+ if (telnetIn != null){
+ telnetIn.close();
+ }
+ if (telnetOut != null) {
+ telnetOut.close();
+ }
+ }
+ }
+}
Propchange: geronimo/xbean/trunk/xbean-telnet/src/main/java/org/apache/xbean/terminal/telnet/TelnetShell.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: geronimo/xbean/trunk/xbean-telnet/src/test/java/org/apache/xbean/telnet/TelnetShellTest.java
------------------------------------------------------------------------------
svn:eol-style = native