Author: ivaynberg
Date: Mon Feb 21 16:34:45 2011
New Revision: 1073054
URL: http://svn.apache.org/viewvc?rev=1073054&view=rev
Log:
tweak assembly to include core module
Modified:
wicket/branches/wicket-1.5-rc2/NOTICE
wicket/branches/wicket-1.5-rc2/wicket-assembly-all.xml
wicket/branches/wicket-1.5-rc2/wicket-auth-roles/src/test/java/org/apache/wicket/authroles/authorization/strategies/role/metadata/InstantiationPermissionsTest.java
Modified: wicket/branches/wicket-1.5-rc2/NOTICE
URL:
http://svn.apache.org/viewvc/wicket/branches/wicket-1.5-rc2/NOTICE?rev=1073054&r1=1073053&r2=1073054&view=diff
==============================================================================
--- wicket/branches/wicket-1.5-rc2/NOTICE (original)
+++ wicket/branches/wicket-1.5-rc2/NOTICE Mon Feb 21 16:34:45 2011
@@ -12,95 +12,43 @@ NB: DO NOT ADD LICENSES/NOTICES/ATTRIBUT
AUTOMATICALLY INCLUDE THE NOTICE IN THIS FILE.
---------------------------------------------------------------------------
-src/./wicket
+src/./wicket-auth-roles
---------------------------------------------------------------------------
- Apache Wicket
- Copyright 2006 The Apache Software Foundation
+ Apache Wicket Auth Roles
+ Copyright 2007 The Apache Software Foundation
This product includes software developed at
The Apache Software Foundation (http://www.apache.org/).
- This product includes software from QOS.ch (http://slf4j.org) licensed
under the X11 license
- Copyright (c) 2004-2007 QOS.ch
-
- Contains Diff library from Mavens JRCS, released under
- The Apache Software License, Version 1.1.
- (c) 1999-2003
-
- org.apache.wicket.util.upload contains parts of Apache Jakarta Commons
FileUpload,
- released under the Apache Software License, Version 2.0.
- (c) 2001-2004
-
- org.apache.wicket.util.io.IOUtils is taken from Apache Avalon, released
- under the Apache Software License, Version 2.0.
- (c) 2001-2004
-
- org.apache.wicket.util.io.ThresholdingOutputStream is taken from
- Apache Jakarta Commons IO, released under the
- Apache Software License, Version 2.0.
- (c) 2001-2004
-
- org.apache.wicket.util.crypt contains Base64 which is taken from
- Apache Jakarta Commons Codec, released under the
- Apache Software License, Version 2.0. Base64UrlSafe
- is derived from Base64.
- (c) 2001-2005
-
- org.apache.wicket.util.concurrent is taken from [1], which states the
following:
- "All classes are released to the public domain and may be used for
- any purpose whatsoever without permission or acknowledgment.
- Portions of the CopyOnWriteArrayList and ConcurrentReaderHashMap
- classes are adapted from Sun JDK source code. These are copyright
- of Sun Microsystems, Inc, and are used with their kind permission,
- as described in this license[2]."
- [1]:
http://g.oswego.edu/dl/classes/EDU/oswego/cs/dl/util/concurrent/intro.html
- [2]: licenses/sun-u.c.license.pdf
-
- org.apache.wicket.markup.html.form.upload.MultiFileUploadField.js is taken
from [1]
- and has the following notice:
- "Licence:
- Use this however/wherever you like, just don't blame me if it breaks
- anything.
-
- Credit:
- If you're nice, you'll leave this bit:
+---------------------------------------------------------------------------
+src/./wicket-guice
+---------------------------------------------------------------------------
+ Apache Wicket
+ Copyright 2007 The Apache Software Foundation
- Class by Stickman -- http://www.the-stickman.com
- with thanks to:
- [for Safari fixes]
- Luis Torrefranca -- http://www.law.pitt.edu
- and
- Shawn Parker & John Pennypacker -- http://www.fuzzycoconut.com
- [for duplicate name bug]
- 'neal'"
- [1]:
http://the-stickman.com/web-development/javascript/upload-multiple-files-with-a-single-file-element/
+ This product includes software developed at
+ The Apache Software Foundation (http://www.apache.org/).
+ This product includes Guice, developed at Google, and licensed
+ under the Apache License 2.0. (http://code.google.com/p/google-guice/).
---------------------------------------------------------------------------
-src/./wicket-auth-roles
+src/./wicket-spring
---------------------------------------------------------------------------
- Apache Wicket Auth Roles
+ Apache Wicket
Copyright 2007 The Apache Software Foundation
This product includes software developed at
The Apache Software Foundation (http://www.apache.org/).
---------------------------------------------------------------------------
-src/./wicket-datetime
+src/./wicket-jmx
---------------------------------------------------------------------------
- Apache Wicket Date Time
+ Apache Wicket
Copyright 2007 The Apache Software Foundation
This product includes software developed at
The Apache Software Foundation (http://www.apache.org/).
-
- Contains code of the Yahoo User Interface library (version: 0.12.2),
- released under the BSD License:
- http://developer.yahoo.net/yui/license.txt
- Copyright (c) 2006, Yahoo!
- This product includes software developed by
- Joda.org (http://www.joda.org/).
-
---------------------------------------------------------------------------
src/./wicket-examples
---------------------------------------------------------------------------
@@ -145,49 +93,84 @@ src/./wicket-examples
which is released under CDDL 1.0 license
(http://www.opensource.org/licenses/cddl1.php).
---------------------------------------------------------------------------
-src/./wicket-extensions
+src/./wicket-core
---------------------------------------------------------------------------
- Apache Wicket Extensions
- Copyright 2007 The Apache Software Foundation
+ Apache Wicket
+ Copyright 2006 The Apache Software Foundation
This product includes software developed at
The Apache Software Foundation (http://www.apache.org/).
- Contains software developed in Apache Turbine, released
- under the Apache Software License, Version 2.0.
+ This product includes software from QOS.ch (http://slf4j.org) licensed
under the X11 license
+ Copyright (c) 2004-2007 QOS.ch
+
+ Contains Diff library from Mavens JRCS, released under
+ The Apache Software License, Version 1.1.
+ (c) 1999-2003
+
+ org.apache.wicket.util.upload contains parts of Apache Jakarta Commons
FileUpload,
+ released under the Apache Software License, Version 2.0.
+ (c) 2001-2004
+
+ org.apache.wicket.util.io.IOUtils is taken from Apache Avalon, released
+ under the Apache Software License, Version 2.0.
+ (c) 2001-2004
+
+ org.apache.wicket.util.io.ThresholdingOutputStream is taken from
+ Apache Jakarta Commons IO, released under the
+ Apache Software License, Version 2.0.
+ (c) 2001-2004
+
+ org.apache.wicket.util.crypt contains Base64 which is taken from
+ Apache Jakarta Commons Codec, released under the
+ Apache Software License, Version 2.0. Base64UrlSafe
+ is derived from Base64.
(c) 2001-2005
----------------------------------------------------------------------------
-src/./wicket-guice
----------------------------------------------------------------------------
- Apache Wicket
- Copyright 2007 The Apache Software Foundation
+ org.apache.wicket.util.concurrent is taken from [1], which states the
following:
+ "All classes are released to the public domain and may be used for
+ any purpose whatsoever without permission or acknowledgment.
+ Portions of the CopyOnWriteArrayList and ConcurrentReaderHashMap
+ classes are adapted from Sun JDK source code. These are copyright
+ of Sun Microsystems, Inc, and are used with their kind permission,
+ as described in this license[2]."
+ [1]:
http://g.oswego.edu/dl/classes/EDU/oswego/cs/dl/util/concurrent/intro.html
+ [2]: licenses/sun-u.c.license.pdf
- This product includes software developed at
- The Apache Software Foundation (http://www.apache.org/).
+ org.apache.wicket.markup.html.form.upload.MultiFileUploadField.js is taken
from [1]
+ and has the following notice:
+ "Licence:
+ Use this however/wherever you like, just don't blame me if it breaks
+ anything.
- This product includes Guice, developed at Google, and licensed
- under the Apache License 2.0. (http://code.google.com/p/google-guice/).
----------------------------------------------------------------------------
-src/./wicket-ioc
----------------------------------------------------------------------------
- Apache Wicket
- Copyright 2007 The Apache Software Foundation
+ Credit:
+ If you're nice, you'll leave this bit:
- This product includes software developed at
- The Apache Software Foundation (http://www.apache.org/).
+ Class by Stickman -- http://www.the-stickman.com
+ with thanks to:
+ [for Safari fixes]
+ Luis Torrefranca -- http://www.law.pitt.edu
+ and
+ Shawn Parker & John Pennypacker -- http://www.fuzzycoconut.com
+ [for duplicate name bug]
+ 'neal'"
+ [1]:
http://the-stickman.com/web-development/javascript/upload-multiple-files-with-a-single-file-element/
---------------------------------------------------------------------------
-src/./wicket-jmx
+src/./wicket-extensions
---------------------------------------------------------------------------
- Apache Wicket
+ Apache Wicket Extensions
Copyright 2007 The Apache Software Foundation
This product includes software developed at
The Apache Software Foundation (http://www.apache.org/).
+ Contains software developed in Apache Turbine, released
+ under the Apache Software License, Version 2.0.
+ (c) 2001-2005
+
---------------------------------------------------------------------------
-src/./wicket-objectssizeof-agent
+src/./wicket-ioc
---------------------------------------------------------------------------
Apache Wicket
Copyright 2007 The Apache Software Foundation
@@ -195,18 +178,25 @@ src/./wicket-objectssizeof-agent
This product includes software developed at
The Apache Software Foundation (http://www.apache.org/).
-
---------------------------------------------------------------------------
-src/./wicket-quickstart/NOTICE
+src/./wicket-datetime
---------------------------------------------------------------------------
- Apache Wicket
+ Apache Wicket Date Time
Copyright 2007 The Apache Software Foundation
This product includes software developed at
The Apache Software Foundation (http://www.apache.org/).
+
+ Contains code of the Yahoo User Interface library (version: 2.8.2r1),
+ released under the BSD License:
+ http://developer.yahoo.net/yui/license.txt
+ Copyright (c) 2010, Yahoo! Inc.
+ This product includes software developed by
+ Joda.org (http://www.joda.org/).
+
---------------------------------------------------------------------------
-src/./wicket-spring
+src/./wicket-objectssizeof-agent
---------------------------------------------------------------------------
Apache Wicket
Copyright 2007 The Apache Software Foundation
@@ -214,3 +204,4 @@ src/./wicket-spring
This product includes software developed at
The Apache Software Foundation (http://www.apache.org/).
+
Modified: wicket/branches/wicket-1.5-rc2/wicket-assembly-all.xml
URL:
http://svn.apache.org/viewvc/wicket/branches/wicket-1.5-rc2/wicket-assembly-all.xml?rev=1073054&r1=1073053&r2=1073054&view=diff
==============================================================================
--- wicket/branches/wicket-1.5-rc2/wicket-assembly-all.xml (original)
+++ wicket/branches/wicket-1.5-rc2/wicket-assembly-all.xml Mon Feb 21 16:34:45
2011
@@ -89,7 +89,7 @@
<moduleSets>
<moduleSet>
<includes>
- <include>org.apache.wicket:wicket</include>
+ <include>org.apache.wicket:wicket-core</include>
<include>org.apache.wicket:wicket-util</include>
<include>org.apache.wicket:wicket-request</include>
<include>org.apache.wicket:wicket-auth-roles</include>
Modified:
wicket/branches/wicket-1.5-rc2/wicket-auth-roles/src/test/java/org/apache/wicket/authroles/authorization/strategies/role/metadata/InstantiationPermissionsTest.java
URL:
http://svn.apache.org/viewvc/wicket/branches/wicket-1.5-rc2/wicket-auth-roles/src/test/java/org/apache/wicket/authroles/authorization/strategies/role/metadata/InstantiationPermissionsTest.java?rev=1073054&r1=1073053&r2=1073054&view=diff
==============================================================================
---
wicket/branches/wicket-1.5-rc2/wicket-auth-roles/src/test/java/org/apache/wicket/authroles/authorization/strategies/role/metadata/InstantiationPermissionsTest.java
(original)
+++
wicket/branches/wicket-1.5-rc2/wicket-auth-roles/src/test/java/org/apache/wicket/authroles/authorization/strategies/role/metadata/InstantiationPermissionsTest.java
Mon Feb 21 16:34:45 2011
@@ -1,125 +1,125 @@
-/*
- * 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.wicket.authroles.authorization.strategies.role.metadata;
-
-import junit.framework.TestCase;
-
-import org.apache.wicket.Page;
-import
org.apache.wicket.authroles.authorization.strategies.role.IRoleCheckingStrategy;
-import org.apache.wicket.authroles.authorization.strategies.role.Roles;
-import org.apache.wicket.util.tester.WicketTester;
-
-/**
- * Test case for
- * {@link
org.apache.wicket.authorization.strategies.role.metadata.InstantiationPermissions}.
- *
- * @author Eelco Hillenius
- */
-public class InstantiationPermissionsTest extends TestCase
-{
- private WicketTester tester;
-
- @Override
- protected void setUp() throws Exception
- {
- tester = new WicketTester();
- }
-
- @Override
- protected void tearDown() throws Exception
- {
- tester.destroy();
- }
-
- /**
- * Test adding roles.
- *
- * @throws Exception
- */
- public void testAdd1() throws Exception
- {
- InstantiationPermissions permissions = new
InstantiationPermissions();
- permissions.authorize(Page.class, new Roles("jonathan"));
- permissions.authorize(Page.class, new Roles("johan"));
- permissions.authorize(Page.class, new Roles("maurice"));
- permissions.authorize(Page.class, new Roles("eelco"));
- assertEquals(4,
permissions.getRolesForComponentClass().get(Page.class).size());
- permissions.unauthorize(Page.class, new Roles("maurice"));
- assertEquals(3,
permissions.getRolesForComponentClass().get(Page.class).size());
- permissions.authorizeAll(Page.class);
- assertEquals(null,
permissions.getRolesForComponentClass().get(Page.class));
- }
-
- /**
- * Test removing roles.
- *
- * @throws Exception
- */
- public void testRemove1() throws Exception
- {
- InstantiationPermissions permissions = new
InstantiationPermissions();
- assertEquals(null,
permissions.getRolesForComponentClass().get(Page.class));
- permissions.unauthorize(Page.class, new Roles("eelco"));
- assertEquals(new
Roles(MetaDataRoleAuthorizationStrategy.NO_ROLE),
-
permissions.getRolesForComponentClass().get(Page.class));
- }
-
- /**
- * Test for issue <a
href="http://issues.apache.org/jira/browse/WICKET-1152";>WICKET-1152</a>.
- *
- */
- public void testRemove2()
- {
- MetaDataRoleAuthorizationStrategy strategy = new
MetaDataRoleAuthorizationStrategy(
- new IRoleCheckingStrategy()
- {
-
- public boolean hasAnyRole(Roles roles)
- {
- return false;
- }
- });
- tester.getApplication().setMetaData(
-
MetaDataRoleAuthorizationStrategy.INSTANTIATION_PERMISSIONS,
- new InstantiationPermissions());
- MetaDataRoleAuthorizationStrategy.unauthorize(Page.class,
"martijn");
- assertFalse(strategy.isInstantiationAuthorized(Page.class));
- }
-
- /**
- * Test consistency in behavior between authorizing a role for a class
and then unauthorizing it
- * with {@link #testRemove2()}.
- */
- public void testRemove3()
- {
- MetaDataRoleAuthorizationStrategy strategy = new
MetaDataRoleAuthorizationStrategy(
- new IRoleCheckingStrategy()
- {
-
- public boolean hasAnyRole(Roles roles)
- {
- return false;
- }
- });
- tester.getApplication().setMetaData(
-
MetaDataRoleAuthorizationStrategy.INSTANTIATION_PERMISSIONS,
- new InstantiationPermissions());
- MetaDataRoleAuthorizationStrategy.authorize(Page.class,
"martijn");
- MetaDataRoleAuthorizationStrategy.unauthorize(Page.class,
"martijn");
- assertFalse(strategy.isInstantiationAuthorized(Page.class));
- }
-}
+/*
+ * 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.wicket.authroles.authorization.strategies.role.metadata;
+
+import junit.framework.TestCase;
+
+import org.apache.wicket.Page;
+import
org.apache.wicket.authroles.authorization.strategies.role.IRoleCheckingStrategy;
+import org.apache.wicket.authroles.authorization.strategies.role.Roles;
+import org.apache.wicket.util.tester.WicketTester;
+
+/**
+ * Test case for
+ * {@link
org.apache.wicket.authorization.strategies.role.metadata.InstantiationPermissions}.
+ *
+ * @author Eelco Hillenius
+ */
+public class InstantiationPermissionsTest extends TestCase
+{
+ private WicketTester tester;
+
+ @Override
+ protected void setUp() throws Exception
+ {
+ tester = new WicketTester();
+ }
+
+ @Override
+ protected void tearDown() throws Exception
+ {
+ tester.destroy();
+ }
+
+ /**
+ * Test adding roles.
+ *
+ * @throws Exception
+ */
+ public void testAdd1() throws Exception
+ {
+ InstantiationPermissions permissions = new
InstantiationPermissions();
+ permissions.authorize(Page.class, new Roles("jonathan"));
+ permissions.authorize(Page.class, new Roles("johan"));
+ permissions.authorize(Page.class, new Roles("maurice"));
+ permissions.authorize(Page.class, new Roles("eelco"));
+ assertEquals(4,
permissions.getRolesForComponentClass().get(Page.class).size());
+ permissions.unauthorize(Page.class, new Roles("maurice"));
+ assertEquals(3,
permissions.getRolesForComponentClass().get(Page.class).size());
+ permissions.authorizeAll(Page.class);
+ assertEquals(null,
permissions.getRolesForComponentClass().get(Page.class));
+ }
+
+ /**
+ * Test removing roles.
+ *
+ * @throws Exception
+ */
+ public void testRemove1() throws Exception
+ {
+ InstantiationPermissions permissions = new
InstantiationPermissions();
+ assertEquals(null,
permissions.getRolesForComponentClass().get(Page.class));
+ permissions.unauthorize(Page.class, new Roles("eelco"));
+ assertEquals(new
Roles(MetaDataRoleAuthorizationStrategy.NO_ROLE),
+
permissions.getRolesForComponentClass().get(Page.class));
+ }
+
+ /**
+ * Test for issue <a
href="http://issues.apache.org/jira/browse/WICKET-1152";>WICKET-1152</a>.
+ *
+ */
+ public void testRemove2()
+ {
+ MetaDataRoleAuthorizationStrategy strategy = new
MetaDataRoleAuthorizationStrategy(
+ new IRoleCheckingStrategy()
+ {
+
+ public boolean hasAnyRole(Roles roles)
+ {
+ return false;
+ }
+ });
+ tester.getApplication().setMetaData(
+
MetaDataRoleAuthorizationStrategy.INSTANTIATION_PERMISSIONS,
+ new InstantiationPermissions());
+ MetaDataRoleAuthorizationStrategy.unauthorize(Page.class,
"martijn");
+ assertFalse(strategy.isInstantiationAuthorized(Page.class));
+ }
+
+ /**
+ * Test consistency in behavior between authorizing a role for a class
and then unauthorizing it
+ * with {@link #testRemove2()}.
+ */
+ public void testRemove3()
+ {
+ MetaDataRoleAuthorizationStrategy strategy = new
MetaDataRoleAuthorizationStrategy(
+ new IRoleCheckingStrategy()
+ {
+
+ public boolean hasAnyRole(Roles roles)
+ {
+ return false;
+ }
+ });
+ tester.getApplication().setMetaData(
+
MetaDataRoleAuthorizationStrategy.INSTANTIATION_PERMISSIONS,
+ new InstantiationPermissions());
+ MetaDataRoleAuthorizationStrategy.authorize(Page.class,
"martijn");
+ MetaDataRoleAuthorizationStrategy.unauthorize(Page.class,
"martijn");
+ assertFalse(strategy.isInstantiationAuthorized(Page.class));
+ }
+}
