You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@wicket.apache.org by eh...@apache.org on 2007/03/04 21:45:58 UTC
svn commit: r514471 - in
/incubator/wicket/branches/wicket-1.x/wicket-examples/src/test/java: nl/
wicket/examples/ wicket/examples/test/ wicket/examples/test/jetty/
wicket/util/license/
Author: ehillenius
Date: Sun Mar 4 12:45:57 2007
New Revision: 514471
URL: http://svn.apache.org/viewvc?view=rev&rev=514471
Log:
WICKET-355
Added:
incubator/wicket/branches/wicket-1.x/wicket-examples/src/test/java/wicket/examples/test/
incubator/wicket/branches/wicket-1.x/wicket-examples/src/test/java/wicket/examples/test/jetty/
- copied from r514467, incubator/wicket/branches/wicket-1.x/wicket-examples/src/test/java/nl/openedge/util/jetty/
Removed:
incubator/wicket/branches/wicket-1.x/wicket-examples/src/test/java/nl/
incubator/wicket/branches/wicket-1.x/wicket-examples/src/test/java/wicket/examples/test/jetty/package.html
Modified:
incubator/wicket/branches/wicket-1.x/wicket-examples/src/test/java/wicket/examples/AllTests.java
incubator/wicket/branches/wicket-1.x/wicket-examples/src/test/java/wicket/examples/WicketWebTestCase.java
incubator/wicket/branches/wicket-1.x/wicket-examples/src/test/java/wicket/examples/test/jetty/AbstractJettyDecorator.java
incubator/wicket/branches/wicket-1.x/wicket-examples/src/test/java/wicket/examples/test/jetty/JettyDecorator.java
incubator/wicket/branches/wicket-1.x/wicket-examples/src/test/java/wicket/examples/test/jetty/JettyHelperException.java
incubator/wicket/branches/wicket-1.x/wicket-examples/src/test/java/wicket/examples/test/jetty/JettyMonitor.java
incubator/wicket/branches/wicket-1.x/wicket-examples/src/test/java/wicket/examples/test/jetty/JettyMonitorException.java
incubator/wicket/branches/wicket-1.x/wicket-examples/src/test/java/wicket/util/license/ApacheLicenceHeaderTest.java
Modified: incubator/wicket/branches/wicket-1.x/wicket-examples/src/test/java/wicket/examples/AllTests.java
URL: http://svn.apache.org/viewvc/incubator/wicket/branches/wicket-1.x/wicket-examples/src/test/java/wicket/examples/AllTests.java?view=diff&rev=514471&r1=514470&r2=514471
==============================================================================
--- incubator/wicket/branches/wicket-1.x/wicket-examples/src/test/java/wicket/examples/AllTests.java (original)
+++ incubator/wicket/branches/wicket-1.x/wicket-examples/src/test/java/wicket/examples/AllTests.java Sun Mar 4 12:45:57 2007
@@ -18,7 +18,6 @@
import junit.framework.Test;
import junit.framework.TestSuite;
-import nl.openedge.util.jetty.JettyDecorator;
import wicket.examples.ajax.prototype.AjaxTest;
import wicket.examples.compref.ComprefTest;
import wicket.examples.encodings.EncodingTest;
@@ -35,6 +34,7 @@
import wicket.examples.repeater.RepeaterTest;
import wicket.examples.signin2.Signin2Test;
import wicket.examples.template.TemplateTest;
+import wicket.examples.test.jetty.JettyDecorator;
import com.meterware.httpunit.HttpUnitOptions;
Modified: incubator/wicket/branches/wicket-1.x/wicket-examples/src/test/java/wicket/examples/WicketWebTestCase.java
URL: http://svn.apache.org/viewvc/incubator/wicket/branches/wicket-1.x/wicket-examples/src/test/java/wicket/examples/WicketWebTestCase.java?view=diff&rev=514471&r1=514470&r2=514471
==============================================================================
--- incubator/wicket/branches/wicket-1.x/wicket-examples/src/test/java/wicket/examples/WicketWebTestCase.java (original)
+++ incubator/wicket/branches/wicket-1.x/wicket-examples/src/test/java/wicket/examples/WicketWebTestCase.java Sun Mar 4 12:45:57 2007
@@ -19,7 +19,6 @@
import junit.framework.Test;
import junit.framework.TestSuite;
import net.sourceforge.jwebunit.junit.WebTestCase;
-import nl.openedge.util.jetty.JettyDecorator;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
@@ -27,6 +26,8 @@
import org.dom4j.Document;
import org.dom4j.DocumentHelper;
import org.dom4j.Node;
+
+import wicket.examples.test.jetty.JettyDecorator;
import com.meterware.httpunit.HttpUnitOptions;
Modified: incubator/wicket/branches/wicket-1.x/wicket-examples/src/test/java/wicket/examples/test/jetty/AbstractJettyDecorator.java
URL: http://svn.apache.org/viewvc/incubator/wicket/branches/wicket-1.x/wicket-examples/src/test/java/wicket/examples/test/jetty/AbstractJettyDecorator.java?view=diff&rev=514471&r1=514467&r2=514471
==============================================================================
--- incubator/wicket/branches/wicket-1.x/wicket-examples/src/test/java/wicket/examples/test/jetty/AbstractJettyDecorator.java (original)
+++ incubator/wicket/branches/wicket-1.x/wicket-examples/src/test/java/wicket/examples/test/jetty/AbstractJettyDecorator.java Sun Mar 4 12:45:57 2007
@@ -1,33 +1,20 @@
/*
- * $Id: AbstractJettyDecorator.java 459490 2006-02-23 23:25:06 +0100 (Thu, 23
- * Feb 2006) jdonnerstag $ $Revision$ $Date: 2006-02-23 23:25:06 +0100
- * (Thu, 23 Feb 2006) $
- *
- * ====================================================================
- * Copyright (c) 2003, Open Edge B.V. All rights reserved. Redistribution and
- * use in source and binary forms, with or without modification, are permitted
- * provided that the following conditions are met: Redistributions of source
- * code must retain the above copyright notice, this list of conditions and the
- * following disclaimer. Redistributions in binary form must reproduce the above
- * copyright notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution. Neither
- * the name of OpenEdge B.V. nor the names of its contributors may be used to
- * endorse or promote products derived from this software without specific prior
- * written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
- * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
+ * 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 nl.openedge.util.jetty;
+package wicket.examples.test.jetty;
import junit.extensions.TestSetup;
import junit.framework.Test;
Modified: incubator/wicket/branches/wicket-1.x/wicket-examples/src/test/java/wicket/examples/test/jetty/JettyDecorator.java
URL: http://svn.apache.org/viewvc/incubator/wicket/branches/wicket-1.x/wicket-examples/src/test/java/wicket/examples/test/jetty/JettyDecorator.java?view=diff&rev=514471&r1=514467&r2=514471
==============================================================================
--- incubator/wicket/branches/wicket-1.x/wicket-examples/src/test/java/wicket/examples/test/jetty/JettyDecorator.java (original)
+++ incubator/wicket/branches/wicket-1.x/wicket-examples/src/test/java/wicket/examples/test/jetty/JettyDecorator.java Sun Mar 4 12:45:57 2007
@@ -1,33 +1,20 @@
/*
- * $Id: JettyDecorator.java 461192 2006-06-28 08:37:16 +0200 (Wed, 28 Jun 2006)
- * ehillenius $ $Revision$ $Date: 2006-06-28 08:37:16 +0200 (Wed, 28 Jun
- * 2006) $
- *
- * ====================================================================
- * Copyright (c) 2003, Open Edge B.V. All rights reserved. Redistribution and
- * use in source and binary forms, with or without modification, are permitted
- * provided that the following conditions are met: Redistributions of source
- * code must retain the above copyright notice, this list of conditions and the
- * following disclaimer. Redistributions in binary form must reproduce the above
- * copyright notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution. Neither
- * the name of OpenEdge B.V. nor the names of its contributors may be used to
- * endorse or promote products derived from this software without specific prior
- * written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
- * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
+ * 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 nl.openedge.util.jetty;
+package wicket.examples.test.jetty;
import junit.framework.Test;
Modified: incubator/wicket/branches/wicket-1.x/wicket-examples/src/test/java/wicket/examples/test/jetty/JettyHelperException.java
URL: http://svn.apache.org/viewvc/incubator/wicket/branches/wicket-1.x/wicket-examples/src/test/java/wicket/examples/test/jetty/JettyHelperException.java?view=diff&rev=514471&r1=514467&r2=514471
==============================================================================
--- incubator/wicket/branches/wicket-1.x/wicket-examples/src/test/java/wicket/examples/test/jetty/JettyHelperException.java (original)
+++ incubator/wicket/branches/wicket-1.x/wicket-examples/src/test/java/wicket/examples/test/jetty/JettyHelperException.java Sun Mar 4 12:45:57 2007
@@ -1,11 +1,20 @@
/*
- * $Id$
- * $Revision$ $Date$
- *
- * ================================================================================
- * Copyright (c) All rechten voorbehouden.
+ * 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 nl.openedge.util.jetty;
+package wicket.examples.test.jetty;
/**
* Exceptions that can be thrown by the JettyMonitor.
Modified: incubator/wicket/branches/wicket-1.x/wicket-examples/src/test/java/wicket/examples/test/jetty/JettyMonitor.java
URL: http://svn.apache.org/viewvc/incubator/wicket/branches/wicket-1.x/wicket-examples/src/test/java/wicket/examples/test/jetty/JettyMonitor.java?view=diff&rev=514471&r1=514467&r2=514471
==============================================================================
--- incubator/wicket/branches/wicket-1.x/wicket-examples/src/test/java/wicket/examples/test/jetty/JettyMonitor.java (original)
+++ incubator/wicket/branches/wicket-1.x/wicket-examples/src/test/java/wicket/examples/test/jetty/JettyMonitor.java Sun Mar 4 12:45:57 2007
@@ -1,32 +1,20 @@
/*
- * $Id$ $Revision:
- * 3905 $ $Date$
- *
- * ====================================================================
- * Copyright (c) 2003, Open Edge B.V. All rights reserved. Redistribution and
- * use in source and binary forms, with or without modification, are permitted
- * provided that the following conditions are met: Redistributions of source
- * code must retain the above copyright notice, this list of conditions and the
- * following disclaimer. Redistributions in binary form must reproduce the above
- * copyright notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution. Neither
- * the name of OpenEdge B.V. nor the names of its contributors may be used to
- * endorse or promote products derived from this software without specific prior
- * written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
- * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
+ * 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 nl.openedge.util.jetty;
+package wicket.examples.test.jetty;
import java.io.IOException;
import java.io.InputStream;
Modified: incubator/wicket/branches/wicket-1.x/wicket-examples/src/test/java/wicket/examples/test/jetty/JettyMonitorException.java
URL: http://svn.apache.org/viewvc/incubator/wicket/branches/wicket-1.x/wicket-examples/src/test/java/wicket/examples/test/jetty/JettyMonitorException.java?view=diff&rev=514471&r1=514467&r2=514471
==============================================================================
--- incubator/wicket/branches/wicket-1.x/wicket-examples/src/test/java/wicket/examples/test/jetty/JettyMonitorException.java (original)
+++ incubator/wicket/branches/wicket-1.x/wicket-examples/src/test/java/wicket/examples/test/jetty/JettyMonitorException.java Sun Mar 4 12:45:57 2007
@@ -1,11 +1,20 @@
/*
- * $Id$
- * $Revision$ $Date$
- *
- * ================================================================================
- * Copyright (c) All rechten voorbehouden.
+ * 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 nl.openedge.util.jetty;
+package wicket.examples.test.jetty;
/**
* Exceptions that can be thrown by the JettyMonitor.
Modified: incubator/wicket/branches/wicket-1.x/wicket-examples/src/test/java/wicket/util/license/ApacheLicenceHeaderTest.java
URL: http://svn.apache.org/viewvc/incubator/wicket/branches/wicket-1.x/wicket-examples/src/test/java/wicket/util/license/ApacheLicenceHeaderTest.java?view=diff&rev=514471&r1=514470&r2=514471
==============================================================================
--- incubator/wicket/branches/wicket-1.x/wicket-examples/src/test/java/wicket/util/license/ApacheLicenceHeaderTest.java (original)
+++ incubator/wicket/branches/wicket-1.x/wicket-examples/src/test/java/wicket/util/license/ApacheLicenceHeaderTest.java Sun Mar 4 12:45:57 2007
@@ -78,10 +78,6 @@
javaIgnore = new String[] {
/*
- * JettyHelper??? License ok???
- */
- "src/test/java/nl/openedge/util/jetty",
- /*
* MIT style license. See NOTICE
*/
"src/test/java/com/meterware/httpunit/ParsedHTML.java"