You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@click.apache.org by sa...@apache.org on 2010/06/16 01:48:36 UTC
svn commit: r955095 - in
/click/trunk/click/extras/test/org/apache/click/util: Address.java
ExtrasClickUtilsTest.java SampleObject.java State.java User.java
Author: sabob
Date: Tue Jun 15 23:48:35 2010
New Revision: 955095
URL: http://svn.apache.org/viewvc?rev=955095&view=rev
Log:
remove dependency between core and extra tests
Added:
click/trunk/click/extras/test/org/apache/click/util/Address.java
click/trunk/click/extras/test/org/apache/click/util/SampleObject.java
click/trunk/click/extras/test/org/apache/click/util/State.java
click/trunk/click/extras/test/org/apache/click/util/User.java
Modified:
click/trunk/click/extras/test/org/apache/click/util/ExtrasClickUtilsTest.java
Added: click/trunk/click/extras/test/org/apache/click/util/Address.java
URL: http://svn.apache.org/viewvc/click/trunk/click/extras/test/org/apache/click/util/Address.java?rev=955095&view=auto
==============================================================================
--- click/trunk/click/extras/test/org/apache/click/util/Address.java (added)
+++ click/trunk/click/extras/test/org/apache/click/util/Address.java Tue Jun 15 23:48:35 2010
@@ -0,0 +1,72 @@
+/*
+ * 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.click.util;
+
+public class Address {
+ private Integer id;
+ private String lineOne;
+ private String lineTwo;
+ private String lineThree;
+ private State state;
+ private boolean active;
+ private Boolean registered;
+
+ public Boolean isRegistered() {
+ return registered;
+ }
+ public void setRegistered(Boolean registered) {
+ this.registered = registered;
+ }
+ public boolean isActive() {
+ return active;
+ }
+ public void setActive(boolean active) {
+ this.active = active;
+ }
+ public State getState() {
+ return state;
+ }
+ public void setState(State state) {
+ this.state = state;
+ }
+ public Integer getId() {
+ return id;
+ }
+ public void setId(Integer id) {
+ this.id = id;
+ }
+ public String getLineOne() {
+ return lineOne;
+ }
+ public void setLineOne(String lineOne) {
+ this.lineOne = lineOne;
+ }
+ public String getLineThree() {
+ return lineThree;
+ }
+ public void setLineThree(String lineThree) {
+ this.lineThree = lineThree;
+ }
+ public String getLineTwo() {
+ return lineTwo;
+ }
+ public void setLineTwo(String lineTwo) {
+ this.lineTwo = lineTwo;
+ }
+}
Modified: click/trunk/click/extras/test/org/apache/click/util/ExtrasClickUtilsTest.java
URL: http://svn.apache.org/viewvc/click/trunk/click/extras/test/org/apache/click/util/ExtrasClickUtilsTest.java?rev=955095&r1=955094&r2=955095&view=diff
==============================================================================
--- click/trunk/click/extras/test/org/apache/click/util/ExtrasClickUtilsTest.java (original)
+++ click/trunk/click/extras/test/org/apache/click/util/ExtrasClickUtilsTest.java Tue Jun 15 23:48:35 2010
@@ -50,7 +50,8 @@ public class ExtrasClickUtilsTest extend
Calendar calendar = new GregorianCalendar(2000, 01, 02);
DATE_OF_BIRTH = calendar.getTime();
}
-
+
+ @Override
protected void setUp() {
MockContext.initContext(Locale.ENGLISH);
}
Added: click/trunk/click/extras/test/org/apache/click/util/SampleObject.java
URL: http://svn.apache.org/viewvc/click/trunk/click/extras/test/org/apache/click/util/SampleObject.java?rev=955095&view=auto
==============================================================================
--- click/trunk/click/extras/test/org/apache/click/util/SampleObject.java (added)
+++ click/trunk/click/extras/test/org/apache/click/util/SampleObject.java Tue Jun 15 23:48:35 2010
@@ -0,0 +1,95 @@
+/*
+ * 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.click.util;
+
+public class SampleObject {
+ private Integer id;
+ private String name;
+ private java.util.Date dateOfBirth;
+ private boolean _boolean;
+ private int _int;
+ private double _double;
+ private String telephone;
+ private boolean active;
+
+ public Integer getId() {
+ return id;
+ }
+
+ public void setId(Integer id) {
+ this.id = id;
+ }
+
+ public String getName() {
+ return name;
+ }
+
+ public void setName(String name) {
+ this.name = name;
+ }
+
+ public java.util.Date getDateOfBirth() {
+ return dateOfBirth;
+ }
+
+ public void setDateOfBirth(java.util.Date dateOfBirth) {
+ this.dateOfBirth = dateOfBirth;
+ }
+
+ public boolean isBoolean() {
+ return _boolean;
+ }
+
+ public void setBoolean(boolean b) {
+ _boolean = b;
+ }
+
+ public double getDouble() {
+ return _double;
+ }
+
+ public void setDouble(double d) {
+ _double = d;
+ }
+
+ public int getInt() {
+ return _int;
+ }
+
+ public void setInt(int i) {
+ _int = i;
+ }
+
+ public String getTelephone() {
+ return telephone;
+ }
+
+ public void setTelephone(String telephone) {
+ this.telephone = telephone;
+ }
+
+ public boolean isActive() {
+ return active;
+ }
+
+ public void setActive(boolean active) {
+ this.active = active;
+ }
+
+}
Added: click/trunk/click/extras/test/org/apache/click/util/State.java
URL: http://svn.apache.org/viewvc/click/trunk/click/extras/test/org/apache/click/util/State.java?rev=955095&view=auto
==============================================================================
--- click/trunk/click/extras/test/org/apache/click/util/State.java (added)
+++ click/trunk/click/extras/test/org/apache/click/util/State.java Tue Jun 15 23:48:35 2010
@@ -0,0 +1,37 @@
+/*
+ * 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.click.util;
+
+public class State {
+ private String code;
+ private Character c;
+
+ public String getCode() {
+ return code;
+ }
+ public void setCode(String code) {
+ this.code = code;
+ }
+ public Character getC() {
+ return c;
+ }
+ public void setC(Character c) {
+ this.c = c;
+ }
+}
Added: click/trunk/click/extras/test/org/apache/click/util/User.java
URL: http://svn.apache.org/viewvc/click/trunk/click/extras/test/org/apache/click/util/User.java?rev=955095&view=auto
==============================================================================
--- click/trunk/click/extras/test/org/apache/click/util/User.java (added)
+++ click/trunk/click/extras/test/org/apache/click/util/User.java Tue Jun 15 23:48:35 2010
@@ -0,0 +1,63 @@
+/*
+ * 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.click.util;
+
+import java.sql.Timestamp;
+
+/**
+ * User value object.
+ */
+public class User {
+ private Integer id;
+ private String name;
+ private Address address;
+ private String telephone;
+ private Timestamp timestamp;
+
+ public Address getAddress() {
+ return address;
+ }
+ public void setAddress(Address address) {
+ this.address = address;
+ }
+ public Integer getId() {
+ return id;
+ }
+ public void setId(Integer id) {
+ this.id = id;
+ }
+ public String getName() {
+ return name;
+ }
+ public void setName(String name) {
+ this.name = name;
+ }
+ public String getTelephone() {
+ return telephone;
+ }
+ public void setTelephone(String telephone) {
+ this.telephone = telephone;
+ }
+ public Timestamp getTimestamp() {
+ return timestamp;
+ }
+ public void setTimestamp(Timestamp timestamp) {
+ this.timestamp = timestamp;
+ }
+}
Re: svn commit: r955095 - in /click/trunk/click/extras/test/org/apache/click/util:
Address.java ExtrasClickUtilsTest.java SampleObject.java State.java User.java
Posted by Finn Bock <bc...@gmail.com>.
2010/6/16 Bob Schellink:
> Thanks Finn, I've moved the util package under extras so should be resolved now. Let me know if you
> still have issue.
It is fine now. Thank you.
regards,
Finn
Re: svn commit: r955095 - in /click/trunk/click/extras/test/org/apache/click/util:
Address.java ExtrasClickUtilsTest.java SampleObject.java State.java User.java
Posted by Bob Schellink <sa...@gmail.com>.
Thanks Finn, I've moved the util package under extras so should be resolved now. Let me know if you
still have issue.
Kind regards
Bob
On 16/06/2010 19:22, Finn Bock wrote:
>> Author: sabob
>> URL: http://svn.apache.org/viewvc?rev=955095&view=rev
>> Log:
>> remove dependency between core and extra tests
>>
>> Added:
>> click/trunk/click/extras/test/org/apache/click/util/Address.java
>> click/trunk/click/extras/test/org/apache/click/util/SampleObject.java
>> click/trunk/click/extras/test/org/apache/click/util/State.java
>> click/trunk/click/extras/test/org/apache/click/util/User.java
>
> Hi, these new classes cause problems for the eclipse build. Eclipse
> brutely compiles classes from most of the source folders and put all
> the .class into a ./bin folder. But having the same class like
> org.apache.click.util.Address on two source folders confuses eclipse
> and it refuse to build the project.
>
> This is not a problem for the ant build because it can easily have
> multiple output folders, but AFAIK eclipse can not. I would hate to
> loose eclipse support, so I hope we can find a solution or workaround.
> Like renaming the classes or the package name.
>
> regards,
> Finn
>
Re: svn commit: r955095 - in /click/trunk/click/extras/test/org/apache/click/util:
Address.java ExtrasClickUtilsTest.java SampleObject.java State.java User.java
Posted by Finn Bock <bc...@gmail.com>.
> Author: sabob
> URL: http://svn.apache.org/viewvc?rev=955095&view=rev
> Log:
> remove dependency between core and extra tests
>
> Added:
> click/trunk/click/extras/test/org/apache/click/util/Address.java
> click/trunk/click/extras/test/org/apache/click/util/SampleObject.java
> click/trunk/click/extras/test/org/apache/click/util/State.java
> click/trunk/click/extras/test/org/apache/click/util/User.java
Hi, these new classes cause problems for the eclipse build. Eclipse
brutely compiles classes from most of the source folders and put all
the .class into a ./bin folder. But having the same class like
org.apache.click.util.Address on two source folders confuses eclipse
and it refuse to build the project.
This is not a problem for the ant build because it can easily have
multiple output folders, but AFAIK eclipse can not. I would hate to
loose eclipse support, so I hope we can find a solution or workaround.
Like renaming the classes or the package name.
regards,
Finn