You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tapestry.apache.org by hl...@apache.org on 2006/11/21 23:13:58 UTC
svn commit: r477927 - in /tapestry/tapestry5/tapestry-core/trunk: ./
src/test/java/org/apache/tapestry/internal/bindings/
Author: hlship
Date: Tue Nov 21 14:13:58 2006
New Revision: 477927
URL: http://svn.apache.org/viewvc?view=rev&rev=477927
Log:
A few minor tweaks to get tapestry-core to build correctly using Maven
Added:
tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/bindings/StringHolder.java
tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/bindings/StringHolderImpl.java
Modified:
tapestry/tapestry5/tapestry-core/trunk/.classpath
tapestry/tapestry5/tapestry-core/trunk/pom.xml
tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/bindings/PropBindingFactoryTest.java
tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/bindings/TargetBean.java
Modified: tapestry/tapestry5/tapestry-core/trunk/.classpath
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/tapestry-core/trunk/.classpath?view=diff&rev=477927&r1=477926&r2=477927
==============================================================================
--- tapestry/tapestry5/tapestry-core/trunk/.classpath (original)
+++ tapestry/tapestry5/tapestry-core/trunk/.classpath Tue Nov 21 14:13:58 2006
@@ -7,6 +7,5 @@
<classpathentry kind="lib" path="src/test/conf"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
<classpathentry kind="con" path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER"/>
- <classpathentry combineaccessrules="false" kind="src" path="/tapestry-ioc"/>
<classpathentry kind="output" path="bin"/>
</classpath>
Modified: tapestry/tapestry5/tapestry-core/trunk/pom.xml
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/tapestry-core/trunk/pom.xml?view=diff&rev=477927&r1=477926&r2=477927
==============================================================================
--- tapestry/tapestry5/tapestry-core/trunk/pom.xml (original)
+++ tapestry/tapestry5/tapestry-core/trunk/pom.xml Tue Nov 21 14:13:58 2006
@@ -19,6 +19,12 @@
<groupId>org.apache.tapestry</groupId>
<artifactId>tapestry-ioc</artifactId>
</dependency>
+ <!-- This should be a transitive dependency from tapestry-ioc, but for some reason,
+ it needs to be explicitly listed. -->
+ <dependency>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ </dependency>
<dependency>
<groupId>commons-codec</groupId>
<artifactId>commons-codec</artifactId>
@@ -27,13 +33,14 @@
<dependency>
<groupId>org.easymock</groupId>
<artifactId>easymock</artifactId>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>org.testng</groupId>
<artifactId>testng</artifactId>
<version>5.1</version>
<classifier>jdk15</classifier>
- <scope>test</scope>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>javax.servlet</groupId>
@@ -70,7 +77,6 @@
<source>1.5</source>
<target>1.5</target>
<optimize>true</optimize>
- <verbose>true</verbose>
</configuration>
</plugin>
</plugins>
Modified: tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/bindings/PropBindingFactoryTest.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/bindings/PropBindingFactoryTest.java?view=diff&rev=477927&r1=477926&r2=477927
==============================================================================
--- tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/bindings/PropBindingFactoryTest.java (original)
+++ tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/bindings/PropBindingFactoryTest.java Tue Nov 21 14:13:58 2006
@@ -18,8 +18,7 @@
import org.apache.tapestry.ComponentResources;
import org.apache.tapestry.internal.test.InternalBaseTestCase;
import org.apache.tapestry.internal.util.IntegerRange;
-import org.apache.tapestry.ioc.Location;
-import org.apache.tapestry.ioc.StringHolder;
+import org.apache.tapestry.ioc.Location;
import org.apache.tapestry.ioc.internal.util.InternalUtils;
import org.apache.tapestry.ioc.internal.util.TapestryException;
import org.apache.tapestry.ioc.services.ClassFactory;
Added: tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/bindings/StringHolder.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/bindings/StringHolder.java?view=auto&rev=477927
==============================================================================
--- tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/bindings/StringHolder.java (added)
+++ tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/bindings/StringHolder.java Tue Nov 21 14:13:58 2006
@@ -0,0 +1,22 @@
+// 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.internal.bindings;
+
+public interface StringHolder
+{
+ void setValue(String value);
+
+ String getValue();
+}
Added: tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/bindings/StringHolderImpl.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/bindings/StringHolderImpl.java?view=auto&rev=477927
==============================================================================
--- tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/bindings/StringHolderImpl.java (added)
+++ tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/bindings/StringHolderImpl.java Tue Nov 21 14:13:58 2006
@@ -0,0 +1,30 @@
+// 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.internal.bindings;
+
+public class StringHolderImpl implements StringHolder
+{
+ private String _value;
+
+ public String getValue()
+ {
+ return _value;
+ }
+
+ public void setValue(String value)
+ {
+ _value = value;
+ }
+}
Modified: tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/bindings/TargetBean.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/bindings/TargetBean.java?view=diff&rev=477927&r1=477926&r2=477927
==============================================================================
--- tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/bindings/TargetBean.java (original)
+++ tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/bindings/TargetBean.java Tue Nov 21 14:13:58 2006
@@ -12,53 +12,50 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.internal.bindings;
-
-import org.apache.tapestry.ioc.StringHolder;
-import org.apache.tapestry.ioc.StringHolderImpl;
-
-public class TargetBean extends DefaultComponentLifecyle
-{
- private String _objectValue;
-
- private int _intValue;
-
- String _writeOnly;
-
- private StringHolder _stringHolder = new StringHolderImpl();
-
- public StringHolder getStringHolder()
- {
- return _stringHolder;
- }
-
- public int getIntValue()
- {
- return _intValue;
- }
-
- public void setIntValue(int intValue)
- {
- _intValue = intValue;
- }
-
- public String getObjectValue()
- {
- return _objectValue;
- }
-
- public void setObjectValue(String objectValue)
- {
- _objectValue = objectValue;
- }
-
- public void setWriteOnly(String value)
- {
- _writeOnly = value;
- }
-
- public String getReadOnly()
- {
- return "ReadOnly";
- }
-}
+package org.apache.tapestry.internal.bindings;
+
+public class TargetBean extends DefaultComponentLifecyle
+{
+ private String _objectValue;
+
+ private int _intValue;
+
+ String _writeOnly;
+
+ private StringHolder _stringHolder = new StringHolderImpl();
+
+ public StringHolder getStringHolder()
+ {
+ return _stringHolder;
+ }
+
+ public int getIntValue()
+ {
+ return _intValue;
+ }
+
+ public void setIntValue(int intValue)
+ {
+ _intValue = intValue;
+ }
+
+ public String getObjectValue()
+ {
+ return _objectValue;
+ }
+
+ public void setObjectValue(String objectValue)
+ {
+ _objectValue = objectValue;
+ }
+
+ public void setWriteOnly(String value)
+ {
+ _writeOnly = value;
+ }
+
+ public String getReadOnly()
+ {
+ return "ReadOnly";
+ }
+}