You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@wicket.apache.org by al...@apache.org on 2007/06/14 18:20:24 UTC
svn commit: r547292 - /incubator/wicket/trunk/NOTICE
Author: almaw
Date: Thu Jun 14 09:20:23 2007
New Revision: 547292
URL: http://svn.apache.org/viewvc?view=rev&rev=547292
Log:
Include jhighlight in NOTICE
Modified:
incubator/wicket/trunk/NOTICE
Modified: incubator/wicket/trunk/NOTICE
URL: http://svn.apache.org/viewvc/incubator/wicket/trunk/NOTICE?view=diff&rev=547292&r1=547291&r2=547292
==============================================================================
--- incubator/wicket/trunk/NOTICE (original)
+++ incubator/wicket/trunk/NOTICE Thu Jun 14 09:20:23 2007
@@ -12,6 +12,15 @@
AUTOMATICALLY INCLUDE THE NOTICE IN THIS FILE.
---------------------------------------------------------------------------
+src/jdk-1.4/wicket-quickstart/NOTICE
+---------------------------------------------------------------------------
+ Apache Wicket
+ Copyright 2007 The Apache Software Foundation
+
+ This product includes software developed at
+ The Apache Software Foundation (http://www.apache.org/).
+
+---------------------------------------------------------------------------
src/jdk-1.4/wicket
---------------------------------------------------------------------------
Apache Wicket
@@ -90,7 +99,7 @@
Joda.org (http://www.joda.org/).
---------------------------------------------------------------------------
-src/jdk-1.4/wicket-extensions
+src/jdk-1.4/wicket-spring
---------------------------------------------------------------------------
Apache Wicket Extensions
Copyright 2007 The Apache Software Foundation
@@ -98,12 +107,8 @@
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/jdk-1.4/wicket-quickstart/NOTICE
+src/jdk-1.4/wicket-extensions
---------------------------------------------------------------------------
Apache Wicket
Copyright 2007 The Apache Software Foundation
@@ -111,8 +116,12 @@
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/jdk-1.4/wicket-spring
+src/jdk-1.5/wicket-jmx
---------------------------------------------------------------------------
Apache Wicket
Copyright 2007 The Apache Software Foundation
@@ -121,7 +130,7 @@
The Apache Software Foundation (http://www.apache.org/).
---------------------------------------------------------------------------
-src/jdk-1.5/wicket-auth-roles
+src/jdk-1.5/wicket-spring-annot
---------------------------------------------------------------------------
Apache Wicket Auth Roles
Copyright 2007 The Apache Software Foundation
@@ -169,16 +178,10 @@
This product includes software developed by
Joda.org (http://www.joda.org/).
-
----------------------------------------------------------------------------
-src/jdk-1.5/wicket-jmx
----------------------------------------------------------------------------
- Apache Wicket
- Copyright 2007 The Apache Software Foundation
-
- This product includes software developed at
- The Apache Software Foundation (http://www.apache.org/).
+ This product includes jhighlight (https://jhighlight.dev.java.net/)
+ which is released under CDDL 1.0 license (http://www.opensource.org/licenses/cddl1.php).
+
---------------------------------------------------------------------------
src/jdk-1.5/wicket-objectssizeof-agent
---------------------------------------------------------------------------
@@ -190,7 +193,7 @@
---------------------------------------------------------------------------
-src/jdk-1.5/wicket-spring-annot
+src/jdk-1.5/wicket-auth-roles
---------------------------------------------------------------------------
Apache Wicket
Copyright 2007 The Apache Software Foundation