Author: hlship
Date: Mon Nov 27 10:40:53 2006
New Revision: 479717
URL: http://svn.apache.org/viewvc?view=rev&rev=479717
Log:
Add a service to track the current thread's locale.
Added:
tapestry/tapestry5/tapestry-ioc/trunk/src/main/java/org/apache/tapestry/ioc/internal/services/ThreadLocaleImpl.java
tapestry/tapestry5/tapestry-ioc/trunk/src/main/java/org/apache/tapestry/ioc/internal/services/ThreadLocaleImplTest.java
tapestry/tapestry5/tapestry-ioc/trunk/src/main/java/org/apache/tapestry/ioc/services/ThreadLocale.java
Modified:
tapestry/tapestry5/tapestry-ioc/trunk/src/main/java/org/apache/tapestry/ioc/Messages.java
tapestry/tapestry5/tapestry-ioc/trunk/src/main/java/org/apache/tapestry/ioc/internal/IOCInternalTestCase.java
tapestry/tapestry5/tapestry-ioc/trunk/src/main/java/org/apache/tapestry/ioc/services/TapestryIOCModule.java
tapestry/tapestry5/tapestry-ioc/trunk/src/main/java/org/apache/tapestry/ioc/test/IOCTestCase.java
tapestry/tapestry5/tapestry-ioc/trunk/src/main/resources/org/apache/tapestry/ioc/internal/IOCStrings.properties
tapestry/tapestry5/tapestry-ioc/trunk/src/main/resources/org/apache/tapestry/ioc/internal/services/ServiceStrings.properties
tapestry/tapestry5/tapestry-ioc/trunk/src/main/resources/org/apache/tapestry/ioc/internal/util/UtilStrings.properties
tapestry/tapestry5/tapestry-ioc/trunk/src/main/resources/org/apache/tapestry/ioc/util/UtilStrings.properties
tapestry/tapestry5/tapestry-ioc/trunk/src/site/site.xml
tapestry/tapestry5/tapestry-ioc/trunk/src/test/conf/testng.xml
tapestry/tapestry5/tapestry-ioc/trunk/src/test/resources/log4j.properties
tapestry/tapestry5/tapestry-ioc/trunk/src/test/resources/org/apache/tapestry/ioc/internal/util/TargetStrings.properties
Modified:
tapestry/tapestry5/tapestry-ioc/trunk/src/main/java/org/apache/tapestry/ioc/Messages.java
URL:
http://svn.apache.org/viewvc/tapestry/tapestry5/tapestry-ioc/trunk/src/main/java/org/apache/tapestry/ioc/Messages.java?view=diff&rev=479717&r1=479716&r2=479717
==============================================================================
---
tapestry/tapestry5/tapestry-ioc/trunk/src/main/java/org/apache/tapestry/ioc/Messages.java
(original)
+++
tapestry/tapestry5/tapestry-ioc/trunk/src/main/java/org/apache/tapestry/ioc/Messages.java
Mon Nov 27 10:40:53 2006
@@ -12,41 +12,39 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.ioc;
-
-/**
- * Provides access to a messages catalog, a set of properties files that
provide localized messages
- * for a particular locale. The message catalog consists of keys and values
and follows the
- * semantics of a Java [EMAIL PROTECTED] java.util.ResourceBundle} with some
changes.
- *
- *
- */
-public interface Messages
-{
- /** Returns true if the bundle contains the named key. */
- boolean contains(String key);
-
- /**
- * Returns the localized message for the given key. If catalog does not
contain such a key, then
- * a modified version of the key is returned (converted to upper case and
enclosed in brackets).
- *
- * @param key
- * @return localized message for key, or placeholder
- */
- String get(String key);
-
- /**
- * Returns a formatter for the message, which can be used to substitute
arguments (as per
- * [EMAIL PROTECTED] java.util.Formatter}.
- *
- * @param key
- * @return formattable object
- */
- MessageFormatter getFormatter(String key);
-
- /**
- * Convienience for accessing a formatter and formatting a localized
message with arguments.
- */
-
- String format(String key, Object... args);
-}
+package org.apache.tapestry.ioc;
+
+/**
+ * Provides access to a messages catalog, a set of properties files that
provide localized messages
+ * for a particular locale. The message catalog consists of keys and values
and follows the
+ * semantics of a Java [EMAIL PROTECTED] java.util.ResourceBundle} with some
changes.
+ */
+public interface Messages
+{
+ /** Returns true if the bundle contains the named key. */
+ boolean contains(String key);
+
+ /**
+ * Returns the localized message for the given key. If catalog does not
contain such a key, then
+ * a modified version of the key is returned (converted to upper case and
enclosed in brackets).
+ *
+ * @param key
+ * @return localized message for key, or placeholder
+ */
+ String get(String key);
+
+ /**
+ * Returns a formatter for the message, which can be used to substitute
arguments (as per
+ * [EMAIL PROTECTED] java.util.Formatter}).
+ *
+ * @param key
+ * @return formattable object
+ */
+ MessageFormatter getFormatter(String key);
+
+ /**
+ * Convienience for accessing a formatter and formatting a localized
message with arguments.
+ */
+
+ String format(String key, Object... args);
+}
Modified:
tapestry/tapestry5/tapestry-ioc/trunk/src/main/java/org/apache/tapestry/ioc/internal/IOCInternalTestCase.java
URL:
http://svn.apache.org/viewvc/tapestry/tapestry5/tapestry-ioc/trunk/src/main/java/org/apache/tapestry/ioc/internal/IOCInternalTestCase.java?view=diff&rev=479717&r1=479716&r2=479717
==============================================================================
---
tapestry/tapestry5/tapestry-ioc/trunk/src/main/java/org/apache/tapestry/ioc/internal/IOCInternalTestCase.java
(original)
+++
tapestry/tapestry5/tapestry-ioc/trunk/src/main/java/org/apache/tapestry/ioc/internal/IOCInternalTestCase.java
Mon Nov 27 10:40:53 2006
@@ -1,3 +1,17 @@
+// Copyright 2006 The Apache Software Foundation
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
package org.apache.tapestry.ioc.internal;
import static org.easymock.EasyMock.isA;
Added:
tapestry/tapestry5/tapestry-ioc/trunk/src/main/java/org/apache/tapestry/ioc/internal/services/ThreadLocaleImpl.java
URL:
http://svn.apache.org/viewvc/tapestry/tapestry5/tapestry-ioc/trunk/src/main/java/org/apache/tapestry/ioc/internal/services/ThreadLocaleImpl.java?view=auto&rev=479717
==============================================================================
---
tapestry/tapestry5/tapestry-ioc/trunk/src/main/java/org/apache/tapestry/ioc/internal/services/ThreadLocaleImpl.java
(added)
+++
tapestry/tapestry5/tapestry-ioc/trunk/src/main/java/org/apache/tapestry/ioc/internal/services/ThreadLocaleImpl.java
Mon Nov 27 10:40:53 2006
@@ -0,0 +1,37 @@
+// Copyright 2006 The Apache Software Foundation
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package org.apache.tapestry.ioc.internal.services;
+
+import java.util.Locale;
+
+import org.apache.tapestry.ioc.internal.util.Defense;
+import org.apache.tapestry.ioc.services.ThreadLocale;
+
+public class ThreadLocaleImpl implements ThreadLocale
+{
+ private Locale _locale = Locale.getDefault();
+
+ public Locale getLocale()
+ {
+ return _locale;
+ }
+
+ public void setLocale(Locale locale)
+ {
+ Defense.notNull(locale, "locale");
+
+ _locale = locale;
+ }
+}
Added:
tapestry/tapestry5/tapestry-ioc/trunk/src/main/java/org/apache/tapestry/ioc/internal/services/ThreadLocaleImplTest.java
URL:
http://svn.apache.org/viewvc/tapestry/tapestry5/tapestry-ioc/trunk/src/main/java/org/apache/tapestry/ioc/internal/services/ThreadLocaleImplTest.java?view=auto&rev=479717
==============================================================================
---
tapestry/tapestry5/tapestry-ioc/trunk/src/main/java/org/apache/tapestry/ioc/internal/services/ThreadLocaleImplTest.java
(added)
+++
tapestry/tapestry5/tapestry-ioc/trunk/src/main/java/org/apache/tapestry/ioc/internal/services/ThreadLocaleImplTest.java
Mon Nov 27 10:40:53 2006
@@ -0,0 +1,70 @@
+// Copyright 2006 The Apache Software Foundation
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package org.apache.tapestry.ioc.internal.services;
+
+import java.util.Locale;
+
+import org.apache.tapestry.ioc.internal.IOCInternalTestCase;
+import org.apache.tapestry.ioc.services.ThreadLocale;
+import org.testng.annotations.BeforeClass;
+import org.testng.annotations.Test;
+
+public class ThreadLocaleImplTest extends IOCInternalTestCase
+{
+ private ThreadLocale _threadLocale;
+
+ private static final Locale FAKE_LOCALE = new Locale("klingon");
+
+ @BeforeClass
+ public void setup()
+ {
+ _threadLocale = getService(ThreadLocale.class);
+ }
+
+ @Test
+ public void different_threads_track_different_values() throws
InterruptedException
+ {
+ final Locale initial = _threadLocale.getLocale();
+
+ _threadLocale.setLocale(FAKE_LOCALE);
+
+ assertSame(_threadLocale.getLocale(), FAKE_LOCALE);
+
+ Runnable r = new Runnable()
+ {
+ public void run()
+ {
+ assertSame(_threadLocale.getLocale(), initial);
+ }
+ };
+
+ Thread t = new Thread(r);
+
+ t.start();
+ t.join();
+ }
+
+ @Test
+ public void thread_locale_reverts_after_cleanup()
+ {
+ Locale initial = _threadLocale.getLocale();
+
+ _threadLocale.setLocale(FAKE_LOCALE);
+
+ cleanupThread();
+
+ assertSame(_threadLocale.getLocale(), initial);
+ }
+}
Modified:
tapestry/tapestry5/tapestry-ioc/trunk/src/main/java/org/apache/tapestry/ioc/services/TapestryIOCModule.java
URL:
http://svn.apache.org/viewvc/tapestry/tapestry5/tapestry-ioc/trunk/src/main/java/org/apache/tapestry/ioc/services/TapestryIOCModule.java?view=diff&rev=479717&r1=479716&r2=479717
==============================================================================
---
tapestry/tapestry5/tapestry-ioc/trunk/src/main/java/org/apache/tapestry/ioc/services/TapestryIOCModule.java
(original)
+++
tapestry/tapestry5/tapestry-ioc/trunk/src/main/java/org/apache/tapestry/ioc/services/TapestryIOCModule.java
Mon Nov 27 10:40:53 2006
@@ -40,6 +40,7 @@
import org.apache.tapestry.ioc.internal.services.PropertyShadowBuilderImpl;
import org.apache.tapestry.ioc.internal.services.ServiceObjectProvider;
import org.apache.tapestry.ioc.internal.services.StrategyBuilderImpl;
+import org.apache.tapestry.ioc.internal.services.ThreadLocaleImpl;
import org.apache.tapestry.ioc.internal.services.TypeCoercerImpl;
import org.apache.tapestry.ioc.util.StrategyRegistry;
@@ -332,8 +333,7 @@
{
String trimmed = input.trim();
- if (trimmed.equalsIgnoreCase("false") || trimmed.length() == 0)
- return false;
+ if (trimmed.equalsIgnoreCase("false") || trimmed.length() ==
0) return false;
// Any non-blank string but "false"
@@ -380,5 +380,11 @@
CoercionTuple<S, T> tuple = new CoercionTuple<S, T>(sourceType,
targetType, coercion);
configuration.add(tuple);
+ }
+
+ @Lifecycle("perthread")
+ public ThreadLocale buildThreadLocale()
+ {
+ return new ThreadLocaleImpl();
}
}
Added:
tapestry/tapestry5/tapestry-ioc/trunk/src/main/java/org/apache/tapestry/ioc/services/ThreadLocale.java
URL:
http://svn.apache.org/viewvc/tapestry/tapestry5/tapestry-ioc/trunk/src/main/java/org/apache/tapestry/ioc/services/ThreadLocale.java?view=auto&rev=479717
==============================================================================
---
tapestry/tapestry5/tapestry-ioc/trunk/src/main/java/org/apache/tapestry/ioc/services/ThreadLocale.java
(added)
+++
tapestry/tapestry5/tapestry-ioc/trunk/src/main/java/org/apache/tapestry/ioc/services/ThreadLocale.java
Mon Nov 27 10:40:53 2006
@@ -0,0 +1,42 @@
+// Copyright 2006 The Apache Software Foundation
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package org.apache.tapestry.ioc.services;
+
+import java.util.Locale;
+
+import org.apache.tapestry.ioc.Registry;
+
+/**
+ * Stores the locale <em>for the current thread</em>. This value persists until
+ * [EMAIL PROTECTED] Registry#cleanupThread()} is invoked.
+ */
+public interface ThreadLocale
+{
+ /**
+ * Updates the locale for the current thread.
+ *
+ * @param locale
+ * the new locale (may not be null)
+ */
+ void setLocale(Locale locale);
+
+ /**
+ * Returns the thread's locale, which will be the JVM's default locale,
until
+ * [EMAIL PROTECTED] #setLocale(Locale)} is invoked.
+ *
+ * @return the thread's locale
+ */
+ Locale getLocale();
+}
Modified:
tapestry/tapestry5/tapestry-ioc/trunk/src/main/java/org/apache/tapestry/ioc/test/IOCTestCase.java
URL:
http://svn.apache.org/viewvc/tapestry/tapestry5/tapestry-ioc/trunk/src/main/java/org/apache/tapestry/ioc/test/IOCTestCase.java?view=diff&rev=479717&r1=479716&r2=479717
==============================================================================
---
tapestry/tapestry5/tapestry-ioc/trunk/src/main/java/org/apache/tapestry/ioc/test/IOCTestCase.java
(original)
+++
tapestry/tapestry5/tapestry-ioc/trunk/src/main/java/org/apache/tapestry/ioc/test/IOCTestCase.java
Mon Nov 27 10:40:53 2006
@@ -1,3 +1,17 @@
+// Copyright 2006 The Apache Software Foundation
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
package org.apache.tapestry.ioc.test;
import java.lang.reflect.Method;
Modified:
tapestry/tapestry5/tapestry-ioc/trunk/src/main/resources/org/apache/tapestry/ioc/internal/IOCStrings.properties
URL:
http://svn.apache.org/viewvc/tapestry/tapestry5/tapestry-ioc/trunk/src/main/resources/org/apache/tapestry/ioc/internal/IOCStrings.properties?view=diff&rev=479717&r1=479716&r2=479717
==============================================================================
---
tapestry/tapestry5/tapestry-ioc/trunk/src/main/resources/org/apache/tapestry/ioc/internal/IOCStrings.properties
(original)
+++
tapestry/tapestry5/tapestry-ioc/trunk/src/main/resources/org/apache/tapestry/ioc/internal/IOCStrings.properties
Mon Nov 27 10:40:53 2006
@@ -1,17 +1,17 @@
-# Copyright 2006 The Apache Software Foundation
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
+# Copyright 2006 The Apache Software Foundation
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
build-method-conflict=Service building method %s conflicts with (has the same
name as, but different parameters than) \
previously seen method %s and has been ignored.
build-method-wrong-return-type=Method %s is named like a service builder
method, \
Modified:
tapestry/tapestry5/tapestry-ioc/trunk/src/main/resources/org/apache/tapestry/ioc/internal/services/ServiceStrings.properties
URL:
http://svn.apache.org/viewvc/tapestry/tapestry5/tapestry-ioc/trunk/src/main/resources/org/apache/tapestry/ioc/internal/services/ServiceStrings.properties?view=diff&rev=479717&r1=479716&r2=479717
==============================================================================
---
tapestry/tapestry5/tapestry-ioc/trunk/src/main/resources/org/apache/tapestry/ioc/internal/services/ServiceStrings.properties
(original)
+++
tapestry/tapestry5/tapestry-ioc/trunk/src/main/resources/org/apache/tapestry/ioc/internal/services/ServiceStrings.properties
Mon Nov 27 10:40:53 2006
@@ -1,17 +1,17 @@
-# Copyright 2006 The Apache Software Foundation
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
+# Copyright 2006 The Apache Software Foundation
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
unable-to-add-method=Unable to add method %s to class %s: %s
unable-to-add-field=Unable to add field %s to class %s: %s
unable-to-add-constructor=Unable to add constructor to class %s: %s
Modified:
tapestry/tapestry5/tapestry-ioc/trunk/src/main/resources/org/apache/tapestry/ioc/internal/util/UtilStrings.properties
URL:
http://svn.apache.org/viewvc/tapestry/tapestry5/tapestry-ioc/trunk/src/main/resources/org/apache/tapestry/ioc/internal/util/UtilStrings.properties?view=diff&rev=479717&r1=479716&r2=479717
==============================================================================
---
tapestry/tapestry5/tapestry-ioc/trunk/src/main/resources/org/apache/tapestry/ioc/internal/util/UtilStrings.properties
(original)
+++
tapestry/tapestry5/tapestry-ioc/trunk/src/main/resources/org/apache/tapestry/ioc/internal/util/UtilStrings.properties
Mon Nov 27 10:40:53 2006
@@ -1,17 +1,17 @@
-# Copyright 2006 The Apache Software Foundation
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
+# Copyright 2006 The Apache Software Foundation
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
dependency-cycle=Unable to add '%s' as a dependency of '%s', as that forms a
dependency cycle ('%<s' depends on itself via '%1$s'). The dependency has been
ignored.
duplicate-orderer=Could not add object with duplicate id '%s'. The duplicate
object has been ignored.
constraint-format=Could not parse ordering constraint '%s' (for '%s'). The
constraint has been ignored.
Modified:
tapestry/tapestry5/tapestry-ioc/trunk/src/main/resources/org/apache/tapestry/ioc/util/UtilStrings.properties
URL:
http://svn.apache.org/viewvc/tapestry/tapestry5/tapestry-ioc/trunk/src/main/resources/org/apache/tapestry/ioc/util/UtilStrings.properties?view=diff&rev=479717&r1=479716&r2=479717
==============================================================================
---
tapestry/tapestry5/tapestry-ioc/trunk/src/main/resources/org/apache/tapestry/ioc/util/UtilStrings.properties
(original)
+++
tapestry/tapestry5/tapestry-ioc/trunk/src/main/resources/org/apache/tapestry/ioc/util/UtilStrings.properties
Mon Nov 27 10:40:53 2006
@@ -1,17 +1,16 @@
-# Copyright 2006 The Apache Software Foundation
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-
+# Copyright 2006 The Apache Software Foundation
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
no-strategy-adapter=No adapter from type %s to type %s is available
(registered types are %s).
Modified: tapestry/tapestry5/tapestry-ioc/trunk/src/site/site.xml
URL:
http://svn.apache.org/viewvc/tapestry/tapestry5/tapestry-ioc/trunk/src/site/site.xml?view=diff&rev=479717&r1=479716&r2=479717
==============================================================================
--- tapestry/tapestry5/tapestry-ioc/trunk/src/site/site.xml (original)
+++ tapestry/tapestry5/tapestry-ioc/trunk/src/site/site.xml Mon Nov 27 10:40:53
2006
@@ -1,20 +1,20 @@
<?xml version="1.0" encoding="ISO-8859-1"?>
-<!--
- Copyright 2006 The Apache Software Foundation
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-
+<!--
+ Copyright 2006 The Apache Software Foundation
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+
<project name="Tapestry IoC">
<bannerLeft>
<name>Tapestry</name>
Modified: tapestry/tapestry5/tapestry-ioc/trunk/src/test/conf/testng.xml
URL:
http://svn.apache.org/viewvc/tapestry/tapestry5/tapestry-ioc/trunk/src/test/conf/testng.xml?view=diff&rev=479717&r1=479716&r2=479717
==============================================================================
--- tapestry/tapestry5/tapestry-ioc/trunk/src/test/conf/testng.xml (original)
+++ tapestry/tapestry5/tapestry-ioc/trunk/src/test/conf/testng.xml Mon Nov 27
10:40:53 2006
@@ -1,20 +1,20 @@
<!DOCTYPE suite SYSTEM "http://testng.org/testng-1.0.dtd";>
-<!--
- Copyright 2006 The Apache Software Foundation
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-
+<!--
+ Copyright 2006 The Apache Software Foundation
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+
<suite name="Tapestry IOC" parallel="false" thread-count="10"
annotations="1.5" verbose="2">
<test name="Tapestry IOC">
<packages>
Modified:
tapestry/tapestry5/tapestry-ioc/trunk/src/test/resources/log4j.properties
URL:
http://svn.apache.org/viewvc/tapestry/tapestry5/tapestry-ioc/trunk/src/test/resources/log4j.properties?view=diff&rev=479717&r1=479716&r2=479717
==============================================================================
--- tapestry/tapestry5/tapestry-ioc/trunk/src/test/resources/log4j.properties
(original)
+++ tapestry/tapestry5/tapestry-ioc/trunk/src/test/resources/log4j.properties
Mon Nov 27 10:40:53 2006
@@ -1,17 +1,17 @@
-# Copyright 2005, 2006 The Apache Software Foundation
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
+# Copyright 2005, 2006 The Apache Software Foundation
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
log4j.rootCategory=WARN, A1
# A1 is set to be a ConsoleAppender.
Modified:
tapestry/tapestry5/tapestry-ioc/trunk/src/test/resources/org/apache/tapestry/ioc/internal/util/TargetStrings.properties
URL:
http://svn.apache.org/viewvc/tapestry/tapestry5/tapestry-ioc/trunk/src/test/resources/org/apache/tapestry/ioc/internal/util/TargetStrings.properties?view=diff&rev=479717&r1=479716&r2=479717
==============================================================================
---
tapestry/tapestry5/tapestry-ioc/trunk/src/test/resources/org/apache/tapestry/ioc/internal/util/TargetStrings.properties
(original)
+++
tapestry/tapestry5/tapestry-ioc/trunk/src/test/resources/org/apache/tapestry/ioc/internal/util/TargetStrings.properties
Mon Nov 27 10:40:53 2006
@@ -1,17 +1,17 @@
-# Copyright 2006 The Apache Software Foundation
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
+# Copyright 2006 The Apache Software Foundation
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
no-args=No arguments.
something-failed=Something failed: %s
result=The result is '%s'.
