You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@wicket.apache.org by jc...@apache.org on 2007/04/10 20:16:39 UTC

svn commit: r527232 [11/28] - in /incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src: main/java/ main/java/org/ main/java/org/apache/ main/java/org/apache/wicket/ main/java/org/apache/wicket/ajax/ main/java/org/apache/wicket/ajax/calldecorator/ ma...

Copied: incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/resolver/AutoComponentResolver.java (from r527216, incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/wicket/markup/resolver/AutoComponentResolver.java)
URL: http://svn.apache.org/viewvc/incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/resolver/AutoComponentResolver.java?view=diff&rev=527232&p1=incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/wicket/markup/resolver/AutoComponentResolver.java&r1=527216&p2=incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/resolver/AutoComponentResolver.java&r2=527232
==============================================================================
--- incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/wicket/markup/resolver/AutoComponentResolver.java (original)
+++ incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/resolver/AutoComponentResolver.java Tue Apr 10 11:15:14 2007
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package wicket.markup.resolver;
+package org.apache.wicket.markup.resolver;
 
 import java.lang.reflect.Constructor;
 import java.lang.reflect.InvocationTargetException;
@@ -22,18 +22,19 @@
 import java.util.Iterator;
 import java.util.Map;
 
-import wicket.Component;
-import wicket.MarkupContainer;
-import wicket.WicketRuntimeException;
-import wicket.markup.ComponentTag;
-import wicket.markup.MarkupException;
-import wicket.markup.MarkupStream;
-import wicket.markup.WicketTag;
-import wicket.markup.parser.filter.WicketTagIdentifier;
-import wicket.util.lang.Classes;
+import org.apache.wicket.Component;
+import org.apache.wicket.MarkupContainer;
+import org.apache.wicket.WicketRuntimeException;
+import org.apache.wicket.markup.ComponentTag;
+import org.apache.wicket.markup.MarkupException;
+import org.apache.wicket.markup.MarkupStream;
+import org.apache.wicket.markup.WicketTag;
+import org.apache.wicket.markup.parser.filter.WicketTagIdentifier;
+import org.apache.wicket.util.lang.Classes;
+
 
 /**
- * <wicket:component class="myApp.MyTable" key=value> tags may be used to add 
+ * <org.apache.wicket:component class="myApp.MyTable" key=value> tags may be used to add 
  * Wicket components (e.g. a specialized PageableListView) and pass parameters (e.g. the number
  * of rows per list view page). The object is automatically instantiated, initialized
  * and added to the page's component hierarchy.
@@ -51,21 +52,21 @@
 
 	static
 	{
-		// register "wicket:fragement"
+		// register "org.apache.wicket:fragement"
 		WicketTagIdentifier.registerWellKnownTagName("component");
 	}
 
     /** 
      * Temporary storage for containers currently being rendered. Thus child
-     * components can be re-parented. Remember: <wicket:component> are an 
+     * components can be re-parented. Remember: <org.apache.wicket:component> are an 
      * exception to the rule. Though the markup of the children are nested
-     * inside <wicket:component>, their respective Java components are not.
-     * They must be added to the parent container of <wicket:component>.
+     * inside <org.apache.wicket:component>, their respective Java components are not.
+     * They must be added to the parent container of <org.apache.wicket:component>.
      */ 
     private final Map nestedComponents = new HashMap();
     
     /**
-     * @see wicket.markup.resolver.IComponentResolver#resolve(MarkupContainer, MarkupStream,
+     * @see org.apache.wicket.markup.resolver.IComponentResolver#resolve(MarkupContainer, MarkupStream,
      *      ComponentTag)
      * @param container
      *            The container parsing its markup
@@ -79,10 +80,10 @@
     public final boolean resolve(final MarkupContainer container, final MarkupStream markupStream,
             final ComponentTag tag)
     {
-        // It must be <wicket:...>
+        // It must be <org.apache.wicket:...>
         if (tag instanceof WicketTag)
         {
-            // It must be <wicket:component...>
+            // It must be <org.apache.wicket:component...>
             final WicketTag wicketTag = (WicketTag)tag;
             if (wicketTag.isComponentTag())
             {
@@ -109,12 +110,12 @@
             }
         }
         
-        // Re-parent children of <wicket:component>. 
+        // Re-parent children of <org.apache.wicket:component>. 
         if ((tag.getId() != null) && nestedComponents.containsKey(container))
         {
             MarkupContainer parent = container.getParent();
             
-            // Take care of nested <wicket:component>
+            // Take care of nested <org.apache.wicket:component>
             while ((parent != null) && nestedComponents.containsKey(parent))
             {
                 parent = parent.getParent();
@@ -157,7 +158,7 @@
         final String classname = tag.getAttributes().getString("class");
         if ((classname == null) || (classname.trim().length() == 0))
         {
-            throw new MarkupException("Tag <wicket:component> must have attribute 'class'");
+            throw new MarkupException("Tag <org.apache.wicket:component> must have attribute 'class'");
         }
 
         // Load the class. In case a Groovy Class Resolver has been provided,
@@ -178,37 +179,37 @@
         catch (NoSuchMethodException e)
         {
             throw new MarkupException(
-                    "Unable to create Component from wicket tag: Cause: " 
+                    "Unable to create Component from org.apache.wicket tag: Cause: " 
                     + e.getMessage());
         }
         catch (InvocationTargetException e)
         {
             throw new MarkupException(
-                    "Unable to create Component from wicket tag: Cause: " 
+                    "Unable to create Component from org.apache.wicket tag: Cause: " 
                     + e.getMessage());
         }
         catch (IllegalAccessException e)
         {
             throw new MarkupException(
-                    "Unable to create Component from wicket tag: Cause: " 
+                    "Unable to create Component from org.apache.wicket tag: Cause: " 
                     + e.getMessage());
         }
         catch (InstantiationException e)
         {
             throw new MarkupException(
-                    "Unable to create Component from wicket tag: Cause: " 
+                    "Unable to create Component from org.apache.wicket tag: Cause: " 
                     + e.getMessage());
         }
         catch (ClassCastException e)
         {
             throw new MarkupException(
-                    "Unable to create Component from wicket tag: Cause: " 
+                    "Unable to create Component from org.apache.wicket tag: Cause: " 
                     + e.getMessage());
         }
         catch (SecurityException e)
         {
             throw new MarkupException(
-                    "Unable to create Component from wicket tag: Cause: " 
+                    "Unable to create Component from org.apache.wicket tag: Cause: " 
                     + e.getMessage());
         }
 

Copied: incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/resolver/AutoLinkResolver.java (from r527216, incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/wicket/markup/resolver/AutoLinkResolver.java)
URL: http://svn.apache.org/viewvc/incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/resolver/AutoLinkResolver.java?view=diff&rev=527232&p1=incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/wicket/markup/resolver/AutoLinkResolver.java&r1=527216&p2=incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/resolver/AutoLinkResolver.java&r2=527232
==============================================================================
--- incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/wicket/markup/resolver/AutoLinkResolver.java (original)
+++ incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/resolver/AutoLinkResolver.java Tue Apr 10 11:15:14 2007
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package wicket.markup.resolver;
+package org.apache.wicket.markup.resolver;
 
 import java.util.HashMap;
 import java.util.HashSet;
@@ -23,29 +23,29 @@
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
+import org.apache.wicket.Component;
+import org.apache.wicket.MarkupContainer;
+import org.apache.wicket.Page;
+import org.apache.wicket.PageParameters;
+import org.apache.wicket.ResourceReference;
+import org.apache.wicket.WicketRuntimeException;
+import org.apache.wicket.application.IClassResolver;
+import org.apache.wicket.markup.ComponentTag;
+import org.apache.wicket.markup.MarkupStream;
+import org.apache.wicket.markup.html.PackageResource;
+import org.apache.wicket.markup.html.WebMarkupContainer;
+import org.apache.wicket.markup.html.link.BookmarkablePageLink;
+import org.apache.wicket.markup.html.link.ExternalLink;
+import org.apache.wicket.markup.parser.filter.WicketLinkTagHandler;
+import org.apache.wicket.protocol.http.RequestUtils;
+import org.apache.wicket.util.lang.Packages;
+import org.apache.wicket.util.string.Strings;
 
-import wicket.Component;
-import wicket.MarkupContainer;
-import wicket.Page;
-import wicket.PageParameters;
-import wicket.ResourceReference;
-import wicket.WicketRuntimeException;
-import wicket.application.IClassResolver;
-import wicket.markup.ComponentTag;
-import wicket.markup.MarkupStream;
-import wicket.markup.html.PackageResource;
-import wicket.markup.html.WebMarkupContainer;
-import wicket.markup.html.link.BookmarkablePageLink;
-import wicket.markup.html.link.ExternalLink;
-import wicket.markup.parser.filter.WicketLinkTagHandler;
-import wicket.protocol.http.RequestUtils;
-import wicket.util.lang.Packages;
-import wicket.util.string.Strings;
 
 /**
  * The AutoLinkResolver is responsible to handle automatic link resolution. Tags
  * are marked "autolink" by the MarkupParser for all tags with href attribute,
- * such as anchor and link tags with no explicit wicket id. E.g. &lt;a
+ * such as anchor and link tags with no explicit org.apache.wicket id. E.g. &lt;a
  * href="Home.html"&gt;
  * <p>
  * If href points to a *.html file, a BookmarkablePageLink will automatically be
@@ -58,7 +58,7 @@
  * <p>
  * If href is no *.html file a static reference to the resource is created.
  * 
- * @see wicket.markup.parser.filter.WicketLinkTagHandler
+ * @see org.apache.wicket.markup.parser.filter.WicketLinkTagHandler
  * 
  * @author Juergen Donnerstag
  * @author Eelco Hillenius
@@ -96,7 +96,7 @@
 				// Href is relative. Create a resource reference pointing at
 				// this file
 
-				// <wicket:head> components are handled differently. We can
+				// <org.apache.wicket:head> components are handled differently. We can
 				// not use the container, because it is the container the
 				// header has been added to (e.g. the Page). What we need
 				// however, is the component (e.g. a Panel) which
@@ -163,7 +163,7 @@
 		}
 
 		/**
-		 * @see wicket.MarkupContainer#isTransparentResolver()
+		 * @see org.apache.wicket.MarkupContainer#isTransparentResolver()
 		 */
 		public boolean isTransparentResolver()
 		{
@@ -172,7 +172,7 @@
 
 		/**
 		 * 
-		 * @see wicket.markup.html.link.BookmarkablePageLink#getURL()
+		 * @see org.apache.wicket.markup.html.link.BookmarkablePageLink#getURL()
 		 */
 		protected CharSequence getURL()
 		{
@@ -213,7 +213,7 @@
 
 	/**
 	 * Encapsulates different aspects of a path. For instance, the path
-	 * <code>wicket.markup.html.tree.Tree/tree.css</code> has extension
+	 * <code>org.apache.wicket.markup.html.tree.Tree/tree.css</code> has extension
 	 * <code>css</code>, is relative (absolute == true) and has no page
 	 * parameters.
 	 */
@@ -381,9 +381,9 @@
 		}
 
 		/**
-		 * @see wicket.markup.resolver.AutoLinkResolver.IAutolinkResolverDelegate#newAutoComponent(wicket.MarkupContainer,
+		 * @see org.apache.wicket.markup.resolver.AutoLinkResolver.IAutolinkResolverDelegate#newAutoComponent(org.apache.wicket.MarkupContainer,
 		 *      java.lang.String,
-		 *      wicket.markup.resolver.AutoLinkResolver.PathInfo)
+		 *      org.apache.wicket.markup.resolver.AutoLinkResolver.PathInfo)
 		 */
 		public Component newAutoComponent(final MarkupContainer container, final String autoId,
 				PathInfo pathInfo)
@@ -487,7 +487,7 @@
 		}
 
 		/**
-		 * @see wicket.MarkupContainer#isTransparentResolver()
+		 * @see org.apache.wicket.MarkupContainer#isTransparentResolver()
 		 */
 		public boolean isTransparentResolver()
 		{
@@ -556,7 +556,7 @@
 		}
 
 		/**
-		 * @see wicket.MarkupContainer#isTransparentResolver()
+		 * @see org.apache.wicket.MarkupContainer#isTransparentResolver()
 		 */
 		public boolean isTransparentResolver()
 		{
@@ -568,7 +568,7 @@
 		 * 
 		 * @param tag
 		 *            the component tag
-		 * @see wicket.Component#onComponentTag(ComponentTag)
+		 * @see org.apache.wicket.Component#onComponentTag(ComponentTag)
 		 */
 		protected final void onComponentTag(final ComponentTag tag)
 		{
@@ -608,9 +608,9 @@
 		}
 
 		/**
-		 * @see wicket.markup.resolver.AutoLinkResolver.IAutolinkResolverDelegate#newAutoComponent(wicket.MarkupContainer,
+		 * @see org.apache.wicket.markup.resolver.AutoLinkResolver.IAutolinkResolverDelegate#newAutoComponent(org.apache.wicket.MarkupContainer,
 		 *      java.lang.String,
-		 *      wicket.markup.resolver.AutoLinkResolver.PathInfo)
+		 *      org.apache.wicket.markup.resolver.AutoLinkResolver.PathInfo)
 		 */
 		public Component newAutoComponent(final MarkupContainer container, final String autoId,
 				final PathInfo pathInfo)
@@ -738,7 +738,7 @@
 	/**
 	 * Automatically creates a BookmarkablePageLink component.
 	 * 
-	 * @see wicket.markup.resolver.IComponentResolver#resolve(MarkupContainer,
+	 * @see org.apache.wicket.markup.resolver.IComponentResolver#resolve(MarkupContainer,
 	 *      MarkupStream, ComponentTag)
 	 * 
 	 * @param markupStream

Copied: incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/resolver/EnclosureResolver.java (from r527216, incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/wicket/markup/resolver/EnclosureResolver.java)
URL: http://svn.apache.org/viewvc/incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/resolver/EnclosureResolver.java?view=diff&rev=527232&p1=incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/wicket/markup/resolver/EnclosureResolver.java&r1=527216&p2=incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/resolver/EnclosureResolver.java&r2=527232
==============================================================================
--- incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/wicket/markup/resolver/EnclosureResolver.java (original)
+++ incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/resolver/EnclosureResolver.java Tue Apr 10 11:15:14 2007
@@ -14,18 +14,18 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package wicket.markup.resolver;
+package org.apache.wicket.markup.resolver;
 
-import wicket.MarkupContainer;
-import wicket.markup.ComponentTag;
-import wicket.markup.MarkupStream;
-import wicket.markup.WicketTag;
-import wicket.markup.html.internal.Enclosure;
-import wicket.markup.parser.filter.EnclosureHandler;
+import org.apache.wicket.MarkupContainer;
+import org.apache.wicket.markup.ComponentTag;
+import org.apache.wicket.markup.MarkupStream;
+import org.apache.wicket.markup.WicketTag;
+import org.apache.wicket.markup.html.internal.Enclosure;
+import org.apache.wicket.markup.parser.filter.EnclosureHandler;
 
 /**
  * This is a tag resolver which automatically adds a Enclosure container for
- * each &lt;wicket:enclosure&gt; tag. As this is no default resolver, it must be
+ * each &lt;org.apache.wicket:enclosure&gt; tag. As this is no default resolver, it must be
  * added manually:
  * 
  * @see EnclosureHandler
@@ -39,8 +39,8 @@
 
 	/**
 	 * 
-	 * @see wicket.markup.resolver.IComponentResolver#resolve(wicket.MarkupContainer,
-	 *      wicket.markup.MarkupStream, wicket.markup.ComponentTag)
+	 * @see org.apache.wicket.markup.resolver.IComponentResolver#resolve(org.apache.wicket.MarkupContainer,
+	 *      org.apache.wicket.markup.MarkupStream, org.apache.wicket.markup.ComponentTag)
 	 */
 	public boolean resolve(final MarkupContainer container, final MarkupStream markupStream,
 			final ComponentTag tag)

Copied: incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/resolver/FragmentResolver.java (from r527216, incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/wicket/markup/resolver/FragmentResolver.java)
URL: http://svn.apache.org/viewvc/incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/resolver/FragmentResolver.java?view=diff&rev=527232&p1=incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/wicket/markup/resolver/FragmentResolver.java&r1=527216&p2=incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/resolver/FragmentResolver.java&r2=527232
==============================================================================
--- incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/wicket/markup/resolver/FragmentResolver.java (original)
+++ incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/resolver/FragmentResolver.java Tue Apr 10 11:15:14 2007
@@ -14,13 +14,13 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package wicket.markup.resolver;
+package org.apache.wicket.markup.resolver;
 
-import wicket.MarkupContainer;
-import wicket.markup.ComponentTag;
-import wicket.markup.MarkupStream;
-import wicket.markup.WicketTag;
-import wicket.markup.parser.filter.WicketTagIdentifier;
+import org.apache.wicket.MarkupContainer;
+import org.apache.wicket.markup.ComponentTag;
+import org.apache.wicket.markup.MarkupStream;
+import org.apache.wicket.markup.WicketTag;
+import org.apache.wicket.markup.parser.filter.WicketTagIdentifier;
 
 /**
  * Usually you either have a markup file or a xml tag with
@@ -42,12 +42,12 @@
 
 	static
 	{
-		// register "wicket:fragement"
+		// register "org.apache.wicket:fragement"
 		WicketTagIdentifier.registerWellKnownTagName("fragment");
 	}
 	
 	/**
-	 * @see wicket.markup.resolver.IComponentResolver#resolve(MarkupContainer,
+	 * @see org.apache.wicket.markup.resolver.IComponentResolver#resolve(MarkupContainer,
 	 *      MarkupStream, ComponentTag)
 	 * 
 	 * @param container
@@ -61,12 +61,12 @@
 	public boolean resolve(final MarkupContainer container, final MarkupStream markupStream,
 			final ComponentTag tag)
 	{
-		// If <wicket:...>
+		// If <org.apache.wicket:...>
 		if (tag instanceof WicketTag)
 		{
 			final WicketTag wTag = (WicketTag)tag;
 
-			// If <wicket:fragment ...>
+			// If <org.apache.wicket:fragment ...>
 			if (wTag.isFragementTag())
 			{
 				// skip the markup associated with the tag

Copied: incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/resolver/HtmlHeaderResolver.java (from r527216, incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/wicket/markup/resolver/HtmlHeaderResolver.java)
URL: http://svn.apache.org/viewvc/incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/resolver/HtmlHeaderResolver.java?view=diff&rev=527232&p1=incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/wicket/markup/resolver/HtmlHeaderResolver.java&r1=527216&p2=incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/resolver/HtmlHeaderResolver.java&r2=527232
==============================================================================
--- incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/wicket/markup/resolver/HtmlHeaderResolver.java (original)
+++ incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/resolver/HtmlHeaderResolver.java Tue Apr 10 11:15:14 2007
@@ -14,23 +14,23 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package wicket.markup.resolver;
+package org.apache.wicket.markup.resolver;
 
-import wicket.MarkupContainer;
-import wicket.WicketRuntimeException;
-import wicket.markup.ComponentTag;
-import wicket.markup.MarkupException;
-import wicket.markup.MarkupStream;
-import wicket.markup.WicketTag;
-import wicket.markup.html.WebMarkupContainer;
-import wicket.markup.html.WebPage;
-import wicket.markup.html.internal.HtmlHeaderContainer;
-import wicket.markup.parser.filter.HtmlHeaderSectionHandler;
-import wicket.markup.parser.filter.WicketTagIdentifier;
+import org.apache.wicket.MarkupContainer;
+import org.apache.wicket.WicketRuntimeException;
+import org.apache.wicket.markup.ComponentTag;
+import org.apache.wicket.markup.MarkupException;
+import org.apache.wicket.markup.MarkupStream;
+import org.apache.wicket.markup.WicketTag;
+import org.apache.wicket.markup.html.WebMarkupContainer;
+import org.apache.wicket.markup.html.WebPage;
+import org.apache.wicket.markup.html.internal.HtmlHeaderContainer;
+import org.apache.wicket.markup.parser.filter.HtmlHeaderSectionHandler;
+import org.apache.wicket.markup.parser.filter.WicketTagIdentifier;
 
 /**
  * This is a tag resolver which handles &lt;head&gt; and
- * &lt;wicket:head&gt;tags. It must be registered (with the application) and
+ * &lt;org.apache.wicket:head&gt;tags. It must be registered (with the application) and
  * assumes that a ComponentTag respectively a WicketTag has already been created
  * (see HtmlheaderSectionHandler and WicketTagIdentifier).
  * <p>
@@ -39,7 +39,7 @@
  * rendered. Please see the javadoc for HtmlHeaderContainer on how it treats the
  * tag.
  * <p>
- * In case of &lt;wicket:head&gt; a simple WebMarkupContainer handles the tag.
+ * In case of &lt;org.apache.wicket:head&gt; a simple WebMarkupContainer handles the tag.
  * 
  * @author Juergen Donnerstag
  */
@@ -49,7 +49,7 @@
 
 	static
 	{
-		// register "wicket:head"
+		// register "org.apache.wicket:head"
 		WicketTagIdentifier.registerWellKnownTagName("head");
 	}
 
@@ -57,7 +57,7 @@
 	 * Try to resolve the tag, then create a component, add it to the container
 	 * and render it.
 	 * 
-	 * @see wicket.markup.resolver.IComponentResolver#resolve(MarkupContainer, MarkupStream,
+	 * @see org.apache.wicket.markup.resolver.IComponentResolver#resolve(MarkupContainer, MarkupStream,
 	 *      ComponentTag)
 	 * 
 	 * @param container
@@ -85,8 +85,8 @@
 		}
 		else if ((tag instanceof WicketTag) && ((WicketTag)tag).isHeadTag())
 		{
-		    // If we found <wicket:head> without surrounding <head> on a Page,
-		    // than we have to add wicket:head into a automatically generated
+		    // If we found <org.apache.wicket:head> without surrounding <head> on a Page,
+		    // than we have to add org.apache.wicket:head into a automatically generated
 		    // head first.
 		    if (container instanceof WebPage)
 		    {
@@ -94,7 +94,7 @@
 				// input the <head> from 'contributors'.
 				final MarkupContainer header = new HtmlHeaderContainer(HtmlHeaderSectionHandler.HEADER_ID);
 				
-				// It is <wicket:head>. Because they do not provide any additional
+				// It is <org.apache.wicket:head>. Because they do not provide any additional
 				// functionality they are merely a means of surrounding relevant
 				// markup. Thus we simply create a WebMarkupContainer to handle
 				// the tag.
@@ -116,7 +116,7 @@
 		    }
 		    else if (container instanceof HtmlHeaderContainer)
 		    {
-				// It is <wicket:head>. Because they do not provide any additional
+				// It is <org.apache.wicket:head>. Because they do not provide any additional
 				// functionality there are merely a means of surrounding relevant
 				// markup. Thus we simply create a WebMarkupContainer to handle
 				// the tag.
@@ -147,7 +147,7 @@
 		    else
 		    {
 		    	throw new MarkupException(
-		    			"Mis-placed <wicket:head>. <wicket:head> must be outside of <wicket:panel> and <wicket:border>");
+		    			"Mis-placed <org.apache.wicket:head>. <org.apache.wicket:head> must be outside of <org.apache.wicket:panel> and <org.apache.wicket:border>");
 		    }
 		    
 			// Yes, we handled the tag

Copied: incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/resolver/IComponentResolver.java (from r527216, incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/wicket/markup/resolver/IComponentResolver.java)
URL: http://svn.apache.org/viewvc/incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/resolver/IComponentResolver.java?view=diff&rev=527232&p1=incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/wicket/markup/resolver/IComponentResolver.java&r1=527216&p2=incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/resolver/IComponentResolver.java&r2=527232
==============================================================================
--- incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/wicket/markup/resolver/IComponentResolver.java (original)
+++ incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/resolver/IComponentResolver.java Tue Apr 10 11:15:14 2007
@@ -14,12 +14,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package wicket.markup.resolver;
+package org.apache.wicket.markup.resolver;
 
-import wicket.IClusterable;
-import wicket.MarkupContainer;
-import wicket.markup.ComponentTag;
-import wicket.markup.MarkupStream;
+import org.apache.wicket.IClusterable;
+import org.apache.wicket.MarkupContainer;
+import org.apache.wicket.markup.ComponentTag;
+import org.apache.wicket.markup.MarkupStream;
 
 /**
  * ApplicationSettings maintains a list of IComponentResolvers.

Copied: incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/resolver/MarkupInheritanceResolver.java (from r527216, incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/wicket/markup/resolver/MarkupInheritanceResolver.java)
URL: http://svn.apache.org/viewvc/incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/resolver/MarkupInheritanceResolver.java?view=diff&rev=527232&p1=incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/wicket/markup/resolver/MarkupInheritanceResolver.java&r1=527216&p2=incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/resolver/MarkupInheritanceResolver.java&r2=527232
==============================================================================
--- incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/wicket/markup/resolver/MarkupInheritanceResolver.java (original)
+++ incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/resolver/MarkupInheritanceResolver.java Tue Apr 10 11:15:14 2007
@@ -14,17 +14,17 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package wicket.markup.resolver;
+package org.apache.wicket.markup.resolver;
 
-import wicket.MarkupContainer;
-import wicket.markup.ComponentTag;
-import wicket.markup.MarkupStream;
-import wicket.markup.WicketTag;
-import wicket.markup.html.WebMarkupContainer;
-import wicket.markup.parser.filter.WicketTagIdentifier;
+import org.apache.wicket.MarkupContainer;
+import org.apache.wicket.markup.ComponentTag;
+import org.apache.wicket.markup.MarkupStream;
+import org.apache.wicket.markup.WicketTag;
+import org.apache.wicket.markup.html.WebMarkupContainer;
+import org.apache.wicket.markup.parser.filter.WicketTagIdentifier;
 
 /**
- * Detect &lt;wicket:extend&gt; and &lt;wicket:child&gt; tags,
+ * Detect &lt;org.apache.wicket:extend&gt; and &lt;org.apache.wicket:child&gt; tags,
  * which are silently ignored, because they have already been processed.
  * 
  * @author Juergen Donnerstag
@@ -35,13 +35,13 @@
 
 	static
 	{
-		// register "wicket:fragement"
+		// register "org.apache.wicket:fragement"
 		WicketTagIdentifier.registerWellKnownTagName("extend");
 		WicketTagIdentifier.registerWellKnownTagName("child");
 	}
 
 	/**
-	 * @see wicket.markup.resolver.IComponentResolver#resolve(MarkupContainer,
+	 * @see org.apache.wicket.markup.resolver.IComponentResolver#resolve(MarkupContainer,
 	 *      MarkupStream, ComponentTag)
 	 * @param container
 	 *            The container parsing its markup
@@ -54,19 +54,19 @@
 	public boolean resolve(final MarkupContainer container, final MarkupStream markupStream,
 			final ComponentTag tag)
 	{
-		// It must be <wicket:...>
+		// It must be <org.apache.wicket:...>
 		if (tag instanceof WicketTag)
 		{
 			final WicketTag wicketTag = (WicketTag)tag;
 			
-			// It must be <wicket:extend...>
+			// It must be <org.apache.wicket:extend...>
 			if (wicketTag.isExtendTag())
 			{
 				container.autoAdd(new TransparentWebMarkupContainer(wicketTag.getId()));
 			    return true;
 			}
 			
-			// It must be <wicket:child...>
+			// It must be <org.apache.wicket:child...>
 			if (wicketTag.isChildTag())
 			{
 				container.autoAdd(new TransparentWebMarkupContainer(wicketTag.getId()));
@@ -94,7 +94,7 @@
 		}
 
 		/**
-		 * @see wicket.MarkupContainer#isTransparentResolver()
+		 * @see org.apache.wicket.MarkupContainer#isTransparentResolver()
 		 */
 		public boolean isTransparentResolver()
 		{

Copied: incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/resolver/ParentResolver.java (from r527216, incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/wicket/markup/resolver/ParentResolver.java)
URL: http://svn.apache.org/viewvc/incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/resolver/ParentResolver.java?view=diff&rev=527232&p1=incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/wicket/markup/resolver/ParentResolver.java&r1=527216&p2=incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/resolver/ParentResolver.java&r2=527232
==============================================================================
--- incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/wicket/markup/resolver/ParentResolver.java (original)
+++ incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/resolver/ParentResolver.java Tue Apr 10 11:15:14 2007
@@ -14,13 +14,13 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package wicket.markup.resolver;
+package org.apache.wicket.markup.resolver;
 
-import wicket.Component;
-import wicket.MarkupContainer;
-import wicket.markup.ComponentTag;
-import wicket.markup.MarkupStream;
-import wicket.markup.WicketTag;
+import org.apache.wicket.Component;
+import org.apache.wicket.MarkupContainer;
+import org.apache.wicket.markup.ComponentTag;
+import org.apache.wicket.markup.MarkupStream;
+import org.apache.wicket.markup.WicketTag;
 
 /**
  * Some containers are transparent to the user (e.g. HtmlHeaderContainer or
@@ -39,7 +39,7 @@
 	 * Note: Special tags like &ltwicket:...&gt> and tags which id start with "_" 
 	 * are not resolved.
 	 * 
-	 * @see wicket.markup.resolver.IComponentResolver#resolve(MarkupContainer, MarkupStream,
+	 * @see org.apache.wicket.markup.resolver.IComponentResolver#resolve(MarkupContainer, MarkupStream,
 	 *      ComponentTag)
 	 */
 	public boolean resolve(final MarkupContainer container, final MarkupStream markupStream,

Copied: incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/resolver/ScopedComponentResolver.java (from r527216, incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/wicket/markup/resolver/ScopedComponentResolver.java)
URL: http://svn.apache.org/viewvc/incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/resolver/ScopedComponentResolver.java?view=diff&rev=527232&p1=incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/wicket/markup/resolver/ScopedComponentResolver.java&r1=527216&p2=incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/resolver/ScopedComponentResolver.java&r2=527232
==============================================================================
--- incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/wicket/markup/resolver/ScopedComponentResolver.java (original)
+++ incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/resolver/ScopedComponentResolver.java Tue Apr 10 11:15:14 2007
@@ -14,20 +14,20 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package wicket.markup.resolver;
+package org.apache.wicket.markup.resolver;
 
-import wicket.Component;
-import wicket.MarkupContainer;
-import wicket.Page;
-import wicket.markup.ComponentTag;
-import wicket.markup.IScopedComponent;
-import wicket.markup.MarkupStream;
-import wicket.markup.html.panel.Panel;
+import org.apache.wicket.Component;
+import org.apache.wicket.MarkupContainer;
+import org.apache.wicket.Page;
+import org.apache.wicket.markup.ComponentTag;
+import org.apache.wicket.markup.IScopedComponent;
+import org.apache.wicket.markup.MarkupStream;
+import org.apache.wicket.markup.html.panel.Panel;
 
 /**
  * Implement a component resolver which walks up the component tree until a Page
- * or Panel and tries to find a component with a matching wicket id, effectivly
- * providing something like scoping for wicket id resolution.
+ * or Panel and tries to find a component with a matching org.apache.wicket id, effectivly
+ * providing something like scoping for org.apache.wicket id resolution.
  * <p>
  * Note: This resolver is not activated by default. It has to be added by means of
  * <code>Application.getComponentResolvers().add(new InheritComponentResolver())
@@ -72,8 +72,8 @@
  * are not in the same hierarchy-line nothing changes. A comp with the same id
  * hides the one of the parent-container with the same id.
  * 
- * @see wicket.MarkupContainer#isTransparentResolver()
- * @see wicket.markup.resolver.ParentResolver
+ * @see org.apache.wicket.MarkupContainer#isTransparentResolver()
+ * @see org.apache.wicket.markup.resolver.ParentResolver
  * 
  * @author Christian Essl
  * @author Juergen Donnerstag
@@ -92,8 +92,8 @@
 
 	/**
 	 * 
-	 * @see wicket.markup.resolver.IComponentResolver#resolve(wicket.MarkupContainer,
-	 *      wicket.markup.MarkupStream, wicket.markup.ComponentTag)
+	 * @see org.apache.wicket.markup.resolver.IComponentResolver#resolve(org.apache.wicket.MarkupContainer,
+	 *      org.apache.wicket.markup.MarkupStream, org.apache.wicket.markup.ComponentTag)
 	 */
 	public boolean resolve(final MarkupContainer container, final MarkupStream markupStream,
 			final ComponentTag tag)

Copied: incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/resolver/WicketContainerResolver.java (from r527216, incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/wicket/markup/resolver/WicketContainerResolver.java)
URL: http://svn.apache.org/viewvc/incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/resolver/WicketContainerResolver.java?view=diff&rev=527232&p1=incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/wicket/markup/resolver/WicketContainerResolver.java&r1=527216&p2=incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/resolver/WicketContainerResolver.java&r2=527232
==============================================================================
--- incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/wicket/markup/resolver/WicketContainerResolver.java (original)
+++ incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/resolver/WicketContainerResolver.java Tue Apr 10 11:15:14 2007
@@ -14,18 +14,18 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package wicket.markup.resolver;
+package org.apache.wicket.markup.resolver;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
+import org.apache.wicket.MarkupContainer;
+import org.apache.wicket.markup.ComponentTag;
+import org.apache.wicket.markup.MarkupStream;
+import org.apache.wicket.markup.parser.filter.WicketTagIdentifier;
 
-import wicket.MarkupContainer;
-import wicket.markup.ComponentTag;
-import wicket.markup.MarkupStream;
-import wicket.markup.parser.filter.WicketTagIdentifier;
 
 /**
- * This is a tag resolver which handles &lt;wicket:container&gt;
+ * This is a tag resolver which handles &lt;org.apache.wicket:container&gt;
  * 
  * Sometimes adding components in certain ways may lead to output of invalid
  * markup. For example, lets pretend we output table rows two at a time using a
@@ -46,14 +46,14 @@
  * 
  * <code>
  * 	<table>
- * 		<wicket:container wicket:id="repeater">
+ * 		<org.apache.wicket:container wicket:id="repeater">
  * 			<tr><td>...</td></tr>
  * 			<tr><td>...</td></tr>
- * 		</wicket:container>
+ * 		</org.apache.wicket:container>
  * 	</table>
  * </code>
  * 
- * The above is valid markup because wicket namespaced tags are allowed anywhere
+ * The above is valid markup because org.apache.wicket namespaced tags are allowed anywhere
  * 
  * @author Igor Vaynberg (ivaynberg)
  */
@@ -63,7 +63,7 @@
 
 	static
 	{
-		// register "wicket:container"
+		// register "org.apache.wicket:container"
 		WicketTagIdentifier.registerWellKnownTagName("container");
 	}
 
@@ -74,7 +74,7 @@
 	 * Try to resolve the tag, then create a component, add it to the container
 	 * and render it.
 	 * 
-	 * @see wicket.markup.resolver.IComponentResolver#resolve(MarkupContainer,
+	 * @see org.apache.wicket.markup.resolver.IComponentResolver#resolve(MarkupContainer,
 	 *      MarkupStream, ComponentTag)
 	 * 
 	 * @param container
@@ -88,7 +88,7 @@
 	public boolean resolve(final MarkupContainer container, final MarkupStream markupStream,
 			final ComponentTag tag)
 	{
-		// this is only here so we register wicket:container tag, this resolver
+		// this is only here so we register org.apache.wicket:container tag, this resolver
 		// does not actually do anything special to the tag
 		return false;
 	}

Copied: incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/resolver/WicketLinkResolver.java (from r527216, incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/wicket/markup/resolver/WicketLinkResolver.java)
URL: http://svn.apache.org/viewvc/incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/resolver/WicketLinkResolver.java?view=diff&rev=527232&p1=incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/wicket/markup/resolver/WicketLinkResolver.java&r1=527216&p2=incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/resolver/WicketLinkResolver.java&r2=527232
==============================================================================
--- incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/wicket/markup/resolver/WicketLinkResolver.java (original)
+++ incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/resolver/WicketLinkResolver.java Tue Apr 10 11:15:14 2007
@@ -14,17 +14,17 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package wicket.markup.resolver;
+package org.apache.wicket.markup.resolver;
 
-import wicket.Component;
-import wicket.MarkupContainer;
-import wicket.markup.ComponentTag;
-import wicket.markup.MarkupStream;
-import wicket.markup.WicketTag;
-import wicket.markup.html.WebMarkupContainer;
+import org.apache.wicket.Component;
+import org.apache.wicket.MarkupContainer;
+import org.apache.wicket.markup.ComponentTag;
+import org.apache.wicket.markup.MarkupStream;
+import org.apache.wicket.markup.WicketTag;
+import org.apache.wicket.markup.html.WebMarkupContainer;
 
 /**
- * This is a tag resolver which handles &lt;wicket:link&gt; tags. Because
+ * This is a tag resolver which handles &lt;org.apache.wicket:link&gt; tags. Because
  * autolinks are already detected and handled, the only task of this
  * resolver will be to add a "transparent" WebMarkupContainer to 
  * transparently handling child components. 
@@ -39,7 +39,7 @@
 	 * Try to resolve the tag, then create a component, add it to the container
 	 * and render it.
 	 * 
-	 * @see wicket.markup.resolver.IComponentResolver#resolve(MarkupContainer, MarkupStream,
+	 * @see org.apache.wicket.markup.resolver.IComponentResolver#resolve(MarkupContainer, MarkupStream,
 	 *      ComponentTag)
 	 * 
 	 * @param container
@@ -65,7 +65,7 @@
 						private static final long serialVersionUID = 1L;
 
 						/**
-						 * @see wicket.MarkupContainer#isTransparentResolver()
+						 * @see org.apache.wicket.MarkupContainer#isTransparentResolver()
 						 */
 						public boolean isTransparentResolver()
 						{

Copied: incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/resolver/WicketMessageResolver.java (from r527216, incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/wicket/markup/resolver/WicketMessageResolver.java)
URL: http://svn.apache.org/viewvc/incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/resolver/WicketMessageResolver.java?view=diff&rev=527232&p1=incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/wicket/markup/resolver/WicketMessageResolver.java&r1=527216&p2=incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/resolver/WicketMessageResolver.java&r2=527232
==============================================================================
--- incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/wicket/markup/resolver/WicketMessageResolver.java (original)
+++ incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/resolver/WicketMessageResolver.java Tue Apr 10 11:15:14 2007
@@ -14,25 +14,25 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package wicket.markup.resolver;
+package org.apache.wicket.markup.resolver;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
+import org.apache.wicket.Component;
+import org.apache.wicket.MarkupContainer;
+import org.apache.wicket.markup.ComponentTag;
+import org.apache.wicket.markup.MarkupException;
+import org.apache.wicket.markup.MarkupStream;
+import org.apache.wicket.markup.WicketTag;
+import org.apache.wicket.markup.html.WebMarkupContainer;
+import org.apache.wicket.markup.html.basic.Label;
+import org.apache.wicket.markup.parser.XmlTag;
+import org.apache.wicket.markup.parser.filter.WicketTagIdentifier;
 
-import wicket.Component;
-import wicket.MarkupContainer;
-import wicket.markup.ComponentTag;
-import wicket.markup.MarkupException;
-import wicket.markup.MarkupStream;
-import wicket.markup.WicketTag;
-import wicket.markup.html.WebMarkupContainer;
-import wicket.markup.html.basic.Label;
-import wicket.markup.parser.XmlTag;
-import wicket.markup.parser.filter.WicketTagIdentifier;
 
 /**
- * This is a tag resolver which handles &lt;wicket:message
- * attr="myKey"&gt;Default Text&lt;/wicket:message&gt;. The resolver will
+ * This is a tag resolver which handles &lt;org.apache.wicket:message
+ * attr="myKey"&gt;Default Text&lt;/org.apache.wicket:message&gt;. The resolver will
  * replace the whole tag with the message found in the properties file
  * associated with the Page. If no message is found, the default body text will
  * remain.
@@ -45,7 +45,7 @@
 	
 	static
 	{
-		// register "wicket:message"
+		// register "org.apache.wicket:message"
 		WicketTagIdentifier.registerWellKnownTagName("message");
 	}
 
@@ -56,7 +56,7 @@
 	 * Try to resolve the tag, then create a component, add it to the container
 	 * and render it.
 	 * 
-	 * @see wicket.markup.resolver.IComponentResolver#resolve(MarkupContainer,
+	 * @see org.apache.wicket.markup.resolver.IComponentResolver#resolve(MarkupContainer,
 	 *      MarkupStream, ComponentTag)
 	 * 
 	 * @param container
@@ -80,7 +80,7 @@
 				if ((messageKey == null) || (messageKey.trim().length() == 0))
 				{
 					throw new MarkupException(
-							"Wrong format of <wicket:message key='xxx'>: attribute 'key' is missing");
+							"Wrong format of <org.apache.wicket:message key='xxx'>: attribute 'key' is missing");
 				}
 
 				final String value = container.getApplication().getResourceSettings().getLocalizer()
@@ -133,12 +133,12 @@
 
 		/**
 		 * 
-		 * @see wicket.Component#onComponentTag(wicket.markup.ComponentTag)
+		 * @see org.apache.wicket.Component#onComponentTag(org.apache.wicket.markup.ComponentTag)
 		 */
 		protected void onComponentTag(ComponentTag tag)
 		{
-			// Convert <wicket:message /> into
-			// <wicket:message>...</wicket:message>
+			// Convert <org.apache.wicket:message /> into
+			// <org.apache.wicket:message>...</org.apache.wicket:message>
 			if (tag.isOpenClose())
 			{
 				tag.setType(XmlTag.OPEN);

Copied: incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/transformer/AbstractOutputTransformerContainer.java (from r527216, incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/wicket/markup/transformer/AbstractOutputTransformerContainer.java)
URL: http://svn.apache.org/viewvc/incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/transformer/AbstractOutputTransformerContainer.java?view=diff&rev=527232&p1=incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/wicket/markup/transformer/AbstractOutputTransformerContainer.java&r1=527216&p2=incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/transformer/AbstractOutputTransformerContainer.java&r2=527232
==============================================================================
--- incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/wicket/markup/transformer/AbstractOutputTransformerContainer.java (original)
+++ incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/transformer/AbstractOutputTransformerContainer.java Tue Apr 10 11:15:14 2007
@@ -14,16 +14,16 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package wicket.markup.transformer;
+package org.apache.wicket.markup.transformer;
 
-import wicket.Component;
-import wicket.MarkupContainer;
-import wicket.Response;
-import wicket.WicketRuntimeException;
-import wicket.markup.ComponentTag;
-import wicket.markup.MarkupStream;
-import wicket.model.IModel;
-import wicket.response.StringResponse;
+import org.apache.wicket.Component;
+import org.apache.wicket.MarkupContainer;
+import org.apache.wicket.Response;
+import org.apache.wicket.WicketRuntimeException;
+import org.apache.wicket.markup.ComponentTag;
+import org.apache.wicket.markup.MarkupStream;
+import org.apache.wicket.model.IModel;
+import org.apache.wicket.response.StringResponse;
 
 /**
  * This abstract container provides the means to post-process the markup
@@ -31,8 +31,8 @@
  * <p>
  * Please see <code>IBehavior</code> for an alternativ based on IBehavior
  * 
- * @see wicket.markup.transformer.AbstractTransformerBehavior
- * @see wicket.markup.transformer.ITransformer
+ * @see org.apache.wicket.markup.transformer.AbstractTransformerBehavior
+ * @see org.apache.wicket.markup.transformer.ITransformer
  * 
  * @author Juergen Donnerstag
  */
@@ -48,7 +48,7 @@
 	/**
 	 * Construct
 	 * 
-	 * @see wicket.Component#Component(String)
+	 * @see org.apache.wicket.Component#Component(String)
 	 */
 	public AbstractOutputTransformerContainer(final String id)
 	{
@@ -58,7 +58,7 @@
 	/**
 	 * Construct
 	 * 
-	 * @see wicket.Component#Component(String, IModel)
+	 * @see org.apache.wicket.Component#Component(String, IModel)
 	 */
 	public AbstractOutputTransformerContainer(final String id, final IModel model)
 	{
@@ -92,15 +92,15 @@
 
 	/**
 	 * 
-	 * @see wicket.markup.transformer.ITransformer#transform(wicket.Component,
+	 * @see org.apache.wicket.markup.transformer.ITransformer#transform(org.apache.wicket.Component,
 	 *      java.lang.String)
 	 */
 	public abstract CharSequence transform(final Component component, final String output)
 			throws Exception;
 
 	/**
-	 * @see wicket.Component#onComponentTagBody(wicket.markup.MarkupStream,
-	 *      wicket.markup.ComponentTag)
+	 * @see org.apache.wicket.Component#onComponentTagBody(org.apache.wicket.markup.MarkupStream,
+	 *      org.apache.wicket.markup.ComponentTag)
 	 */
 	protected final void onComponentTagBody(final MarkupStream markupStream,
 			final ComponentTag openTag)
@@ -123,7 +123,7 @@
 	}
 
 	/**
-	 * @see wicket.Component#onRender(MarkupStream)
+	 * @see org.apache.wicket.Component#onRender(MarkupStream)
 	 */
 	protected final void onRender(final MarkupStream markupStream)
 	{

Copied: incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/transformer/AbstractTransformerBehavior.java (from r527216, incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/wicket/markup/transformer/AbstractTransformerBehavior.java)
URL: http://svn.apache.org/viewvc/incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/transformer/AbstractTransformerBehavior.java?view=diff&rev=527232&p1=incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/wicket/markup/transformer/AbstractTransformerBehavior.java&r1=527216&p2=incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/transformer/AbstractTransformerBehavior.java&r2=527232
==============================================================================
--- incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/wicket/markup/transformer/AbstractTransformerBehavior.java (original)
+++ incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/transformer/AbstractTransformerBehavior.java Tue Apr 10 11:15:14 2007
@@ -14,21 +14,21 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package wicket.markup.transformer;
+package org.apache.wicket.markup.transformer;
 
-import wicket.Component;
-import wicket.RequestCycle;
-import wicket.Response;
-import wicket.WicketRuntimeException;
-import wicket.behavior.AbstractBehavior;
-import wicket.markup.ComponentTag;
-import wicket.response.StringResponse;
+import org.apache.wicket.Component;
+import org.apache.wicket.RequestCycle;
+import org.apache.wicket.Response;
+import org.apache.wicket.WicketRuntimeException;
+import org.apache.wicket.behavior.AbstractBehavior;
+import org.apache.wicket.markup.ComponentTag;
+import org.apache.wicket.response.StringResponse;
 
 /**
  * A IBehavior which can be added to any component. It allows to post-process
  * (transform) the markup generated by the component.
  * 
- * @see wicket.markup.transformer.AbstractOutputTransformerContainer
+ * @see org.apache.wicket.markup.transformer.AbstractOutputTransformerContainer
  * 
  * @author Juergen Donnerstag
  */
@@ -57,12 +57,12 @@
 	}
 
 	/**
-	 * @see wicket.behavior.IBehavior#onComponentTag(wicket.Component,
-	 *      wicket.markup.ComponentTag)
+	 * @see org.apache.wicket.behavior.IBehavior#onComponentTag(org.apache.wicket.Component,
+	 *      org.apache.wicket.markup.ComponentTag)
 	 */
 	public void onComponentTag(final Component component, final ComponentTag tag)
 	{
-		tag.put("xmlns:wicket", "http://wicket.sourceforge.net");
+		tag.put("xmlns:org.apache.wicket", "http://org.apache.wicket.sourceforge.net");
 
 		final RequestCycle requestCycle = RequestCycle.get();
 
@@ -81,7 +81,7 @@
 	}
 
 	/**
-	 * @see wicket.behavior.AbstractBehavior#onRendered(wicket.Component)
+	 * @see org.apache.wicket.behavior.AbstractBehavior#onRendered(org.apache.wicket.Component)
 	 */
 	public void onRendered(final Component component)
 	{
@@ -108,7 +108,7 @@
 	}
 
 	/**
-	 * @see wicket.behavior.AbstractBehavior#cleanup()
+	 * @see org.apache.wicket.behavior.AbstractBehavior#cleanup()
 	 */
 	public void cleanup()
 	{
@@ -116,7 +116,7 @@
 	}
 
 	/**
-	 * @see wicket.behavior.AbstractBehavior#onException(wicket.Component, java.lang.RuntimeException)
+	 * @see org.apache.wicket.behavior.AbstractBehavior#onException(org.apache.wicket.Component, java.lang.RuntimeException)
 	 */
 	public void onException(Component component, RuntimeException exception)
 	{
@@ -129,7 +129,7 @@
 	
 	/**
 	 * 
-	 * @see wicket.markup.transformer.ITransformer#transform(wicket.Component,
+	 * @see org.apache.wicket.markup.transformer.ITransformer#transform(org.apache.wicket.Component,
 	 *      java.lang.String)
 	 */
 	public abstract CharSequence transform(final Component component, final String output)

Copied: incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/transformer/ITransformer.java (from r527216, incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/wicket/markup/transformer/ITransformer.java)
URL: http://svn.apache.org/viewvc/incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/transformer/ITransformer.java?view=diff&rev=527232&p1=incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/wicket/markup/transformer/ITransformer.java&r1=527216&p2=incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/transformer/ITransformer.java&r2=527232
==============================================================================
--- incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/wicket/markup/transformer/ITransformer.java (original)
+++ incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/transformer/ITransformer.java Tue Apr 10 11:15:14 2007
@@ -14,9 +14,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package wicket.markup.transformer;
+package org.apache.wicket.markup.transformer;
 
-import wicket.Component;
+import org.apache.wicket.Component;
 
 /**
  * A common interface to be implemented be OutputTransformerContainers and

Copied: incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/transformer/NoopOutputTransformerContainer.java (from r527216, incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/wicket/markup/transformer/NoopOutputTransformerContainer.java)
URL: http://svn.apache.org/viewvc/incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/transformer/NoopOutputTransformerContainer.java?view=diff&rev=527232&p1=incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/wicket/markup/transformer/NoopOutputTransformerContainer.java&r1=527216&p2=incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/transformer/NoopOutputTransformerContainer.java&r2=527232
==============================================================================
--- incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/wicket/markup/transformer/NoopOutputTransformerContainer.java (original)
+++ incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/transformer/NoopOutputTransformerContainer.java Tue Apr 10 11:15:14 2007
@@ -14,10 +14,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package wicket.markup.transformer;
+package org.apache.wicket.markup.transformer;
 
-import wicket.Component;
-import wicket.model.IModel;
+import org.apache.wicket.Component;
+import org.apache.wicket.model.IModel;
 
 /**
  * An implementation of an output transformer which does nothing. It does not
@@ -32,7 +32,7 @@
 	/**
 	 * Construct
 	 * 
-	 * @see wicket.Component#Component(String)
+	 * @see org.apache.wicket.Component#Component(String)
 	 */
 	public NoopOutputTransformerContainer(final String id)
 	{
@@ -42,7 +42,7 @@
 	/**
 	 * Construct
 	 * 
-	 * @see wicket.Component#Component(String, IModel)
+	 * @see org.apache.wicket.Component#Component(String, IModel)
 	 */
 	public NoopOutputTransformerContainer(final String id, final IModel model)
 	{
@@ -51,7 +51,7 @@
 
 	/**
 	 * 
-	 * @see wicket.markup.transformer.ITransformer#transform(wicket.Component, java.lang.String)
+	 * @see org.apache.wicket.markup.transformer.ITransformer#transform(org.apache.wicket.Component, java.lang.String)
 	 */
 	public CharSequence transform(final Component component, final String output)
 	{

Copied: incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/transformer/XsltOutputTransformerContainer.java (from r527216, incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/wicket/markup/transformer/XsltOutputTransformerContainer.java)
URL: http://svn.apache.org/viewvc/incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/transformer/XsltOutputTransformerContainer.java?view=diff&rev=527232&p1=incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/wicket/markup/transformer/XsltOutputTransformerContainer.java&r1=527216&p2=incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/transformer/XsltOutputTransformerContainer.java&r2=527232
==============================================================================
--- incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/wicket/markup/transformer/XsltOutputTransformerContainer.java (original)
+++ incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/transformer/XsltOutputTransformerContainer.java Tue Apr 10 11:15:14 2007
@@ -14,12 +14,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package wicket.markup.transformer;
+package org.apache.wicket.markup.transformer;
 
-import wicket.AttributeModifier;
-import wicket.Component;
-import wicket.model.IModel;
-import wicket.model.Model;
+import org.apache.wicket.AttributeModifier;
+import org.apache.wicket.Component;
+import org.apache.wicket.model.IModel;
+import org.apache.wicket.model.Model;
 
 /**
  * A container which output markup will be processes by a XSLT processor prior
@@ -30,13 +30,13 @@
  * The containers tag will be the root element of the xml data applied for
  * transformation to ensure the xml data are well formed (single root element).
  * In addition the attribute
- * <code>xmlns:wicket="http://wicket.sourceforge.net"</code> is added to the
- * root element to allow the XSL processor to handle the wicket namespace.
+ * <code>xmlns:org.apache.wicket="http://org.apache.wicket.sourceforge.net"</code> is added to the
+ * root element to allow the XSL processor to handle the org.apache.wicket namespace.
  * <p>
  * Similar to this container, a <code>IBehavior</code> is available which does
  * the same, but does not require an additional Container.
  * 
- * @see wicket.markup.transformer.XsltTransfomerBehavior
+ * @see org.apache.wicket.markup.transformer.XsltTransfomerBehavior
  * 
  * @author Juergen Donnerstag
  */
@@ -51,7 +51,7 @@
 	 * Instead of using the default mechanism to determine the associated XSL
 	 * file, it is given by the user.
 	 * 
-	 * @see wicket.Component#Component(String, IModel)
+	 * @see org.apache.wicket.Component#Component(String, IModel)
 	 * 
 	 * @param xslFilePath
 	 *            XSL input file path
@@ -69,15 +69,15 @@
 		// root element)
 		setTransformBodyOnly(false);
 
-		// Make the XSLT processor happy and allow him to handle the wicket
-		// tags and attributes which are in the wicket namespace
-		add(new AttributeModifier("xmlns:wicket", true, new Model("http://wicket.sourceforge.net")));
+		// Make the XSLT processor happy and allow him to handle the org.apache.wicket
+		// tags and attributes which are in the org.apache.wicket namespace
+		add(new AttributeModifier("xmlns:org.apache.wicket", true, new Model("http://org.apache.wicket.sourceforge.net")));
 	}
 
 	/**
 	 * Construct
 	 * 
-	 * @see wicket.Component#Component(String, IModel)
+	 * @see org.apache.wicket.Component#Component(String, IModel)
 	 */
 	public XsltOutputTransformerContainer(final String id, final IModel model)
 	{
@@ -87,7 +87,7 @@
 	/**
 	 * Construct
 	 * 
-	 * @see wicket.Component#Component(String)
+	 * @see org.apache.wicket.Component#Component(String)
 	 */
 	public XsltOutputTransformerContainer(final String id)
 	{
@@ -96,7 +96,7 @@
 
 	/**
 	 * 
-	 * @see wicket.MarkupContainer#getMarkupType()
+	 * @see org.apache.wicket.MarkupContainer#getMarkupType()
 	 */
 	public String getMarkupType()
 	{
@@ -105,7 +105,7 @@
 
 	/**
 	 * 
-	 * @see wicket.markup.transformer.ITransformer#transform(wicket.Component,
+	 * @see org.apache.wicket.markup.transformer.ITransformer#transform(org.apache.wicket.Component,
 	 *      java.lang.String)
 	 */
 	public CharSequence transform(final Component component, final String output) throws Exception

Copied: incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/transformer/XsltTransformer.java (from r527216, incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/wicket/markup/transformer/XsltTransformer.java)
URL: http://svn.apache.org/viewvc/incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/transformer/XsltTransformer.java?view=diff&rev=527232&p1=incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/wicket/markup/transformer/XsltTransformer.java&r1=527216&p2=incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/transformer/XsltTransformer.java&r2=527232
==============================================================================
--- incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/wicket/markup/transformer/XsltTransformer.java (original)
+++ incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/transformer/XsltTransformer.java Tue Apr 10 11:15:14 2007
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package wicket.markup.transformer;
+package org.apache.wicket.markup.transformer;
 
 import java.io.FileNotFoundException;
 import java.io.StringReader;
@@ -25,16 +25,17 @@
 import javax.xml.transform.stream.StreamResult;
 import javax.xml.transform.stream.StreamSource;
 
-import wicket.Application;
-import wicket.Component;
-import wicket.util.resource.IResourceStream;
-import wicket.util.resource.locator.IResourceStreamLocator;
+import org.apache.wicket.Application;
+import org.apache.wicket.Component;
+import org.apache.wicket.util.resource.IResourceStream;
+import org.apache.wicket.util.resource.locator.IResourceStreamLocator;
+
 
 /**
  * A processor to XSLT transform the output generated by a Component.
  * 
- * @see wicket.markup.transformer.XsltOutputTransformerContainer
- * @see wicket.markup.transformer.XsltTransfomerBehavior
+ * @see org.apache.wicket.markup.transformer.XsltOutputTransformerContainer
+ * @see org.apache.wicket.markup.transformer.XsltTransfomerBehavior
  * 
  * @author Juergen Donnerstag
  */
@@ -82,7 +83,7 @@
 	 * with an associated markup and must have a filename equal to the
 	 * component's id.
 	 * 
-	 * @see wicket.markup.transformer.ITransformer#transform(wicket.Component,
+	 * @see org.apache.wicket.markup.transformer.ITransformer#transform(org.apache.wicket.Component,
 	 *      java.lang.String)
 	 */
 	public CharSequence transform(final Component component, final String output) throws Exception

Copied: incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/transformer/XsltTransformerBehavior.java (from r527216, incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/wicket/markup/transformer/XsltTransformerBehavior.java)
URL: http://svn.apache.org/viewvc/incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/transformer/XsltTransformerBehavior.java?view=diff&rev=527232&p1=incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/wicket/markup/transformer/XsltTransformerBehavior.java&r1=527216&p2=incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/transformer/XsltTransformerBehavior.java&r2=527232
==============================================================================
--- incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/wicket/markup/transformer/XsltTransformerBehavior.java (original)
+++ incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/transformer/XsltTransformerBehavior.java Tue Apr 10 11:15:14 2007
@@ -14,10 +14,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package wicket.markup.transformer;
+package org.apache.wicket.markup.transformer;
 
-import wicket.Component;
-import wicket.markup.ComponentTag;
+import org.apache.wicket.Component;
+import org.apache.wicket.markup.ComponentTag;
 
 /**
  * An IBehavior which can be added to any component except ListView. It allows
@@ -28,8 +28,8 @@
  * The containers tag will be the root element of the xml data applied for
  * transformation to ensure the xml data are well formed (single root element).
  * In addition the attribute
- * <code>xmlns:wicket="http://wicket.sourceforge.net"</code> is added to the
- * root element to allow the XSL processor to handle the wicket namespace.
+ * <code>xmlns:org.apache.wicket="http://org.apache.wicket.sourceforge.net"</code> is added to the
+ * root element to allow the XSL processor to handle the org.apache.wicket namespace.
  * <p>
  * The reason why the transformer can not be used to XSLT the ListViews output
  * is because of the ListViews markup being reused for each ListItem. Please use
@@ -37,8 +37,8 @@
  * print a list of &lt;tr&gt; tags, than the transformer container must enclose
  * the &lt;table&gt; tag as well to be HTML compliant.
  * 
- * @see wicket.markup.transformer.AbstractOutputTransformerContainer
- * @see wicket.markup.transformer.XsltOutputTransformerContainer
+ * @see org.apache.wicket.markup.transformer.AbstractOutputTransformerContainer
+ * @see org.apache.wicket.markup.transformer.XsltOutputTransformerContainer
  * 
  * @author Juergen Donnerstag
  */
@@ -67,20 +67,20 @@
 	}
 
 	/**
-	 * @see wicket.behavior.IBehavior#onComponentTag(wicket.Component,
-	 *      wicket.markup.ComponentTag)
+	 * @see org.apache.wicket.behavior.IBehavior#onComponentTag(org.apache.wicket.Component,
+	 *      org.apache.wicket.markup.ComponentTag)
 	 */
 	public void onComponentTag(final Component component, final ComponentTag tag)
 	{
-		tag.put("xmlns:wicket", "http://wicket.sourceforge.net");
+		tag.put("xmlns:org.apache.wicket", "http://org.apache.wicket.sourceforge.net");
 
-		// Make the XSLT processor happy and allow it to handle the wicket
-		// tags and attributes that are in the wicket namespace
+		// Make the XSLT processor happy and allow it to handle the org.apache.wicket
+		// tags and attributes that are in the org.apache.wicket namespace
 		super.onComponentTag(component, tag);
 	}
 
 	/**
-	 * @see wicket.markup.transformer.ITransformer#transform(wicket.Component,
+	 * @see org.apache.wicket.markup.transformer.ITransformer#transform(org.apache.wicket.Component,
 	 *      java.lang.String)
 	 */
 	public CharSequence transform(final Component component, final String output) throws Exception

Copied: incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/org/apache/wicket/model/AbstractPropertyModel.java (from r527216, incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/wicket/model/AbstractPropertyModel.java)
URL: http://svn.apache.org/viewvc/incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/org/apache/wicket/model/AbstractPropertyModel.java?view=diff&rev=527232&p1=incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/wicket/model/AbstractPropertyModel.java&r1=527216&p2=incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/org/apache/wicket/model/AbstractPropertyModel.java&r2=527232
==============================================================================
--- incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/wicket/model/AbstractPropertyModel.java (original)
+++ incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/org/apache/wicket/model/AbstractPropertyModel.java Tue Apr 10 11:15:14 2007
@@ -14,18 +14,18 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package wicket.model;
+package org.apache.wicket.model;
 
-import wicket.Component;
-import wicket.Session;
-import wicket.util.lang.PropertyResolver;
-import wicket.util.lang.PropertyResolverConverter;
-import wicket.util.string.Strings;
+import org.apache.wicket.Component;
+import org.apache.wicket.Session;
+import org.apache.wicket.util.lang.PropertyResolver;
+import org.apache.wicket.util.lang.PropertyResolverConverter;
+import org.apache.wicket.util.string.Strings;
 
 /**
  * Serves as a base class for different kinds of property models.
  * 
- * @see wicket.model.AbstractDetachableModel
+ * @see org.apache.wicket.model.AbstractDetachableModel
  * 
  * @author Chris Turner
  * @author Eelco Hillenius
@@ -53,7 +53,7 @@
 	}
 	
 	/**
-	 * @see wicket.model.IChainingModel#getChainedModel()
+	 * @see org.apache.wicket.model.IChainingModel#getChainedModel()
 	 */
 	public IModel getChainedModel()
 	{
@@ -62,7 +62,7 @@
 	}
 	
 	/**
-	 * @see wicket.model.IChainingModel#setChainedModel(wicket.model.IModel)
+	 * @see org.apache.wicket.model.IChainingModel#setChainedModel(org.apache.wicket.model.IModel)
 	 */
 	public void setChainedModel(IModel model)
 	{
@@ -101,7 +101,7 @@
 	}
 
 	/**
-	 * @see wicket.model.IModel#getObject()
+	 * @see org.apache.wicket.model.IModel#getObject()
 	 */
 	public Object getObject()
 	{

Copied: incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/org/apache/wicket/model/AbstractReadOnlyModel.java (from r527216, incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/wicket/model/AbstractReadOnlyModel.java)
URL: http://svn.apache.org/viewvc/incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/org/apache/wicket/model/AbstractReadOnlyModel.java?view=diff&rev=527232&p1=incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/wicket/model/AbstractReadOnlyModel.java&r1=527216&p2=incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/org/apache/wicket/model/AbstractReadOnlyModel.java&r2=527232
==============================================================================
--- incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/wicket/model/AbstractReadOnlyModel.java (original)
+++ incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/org/apache/wicket/model/AbstractReadOnlyModel.java Tue Apr 10 11:15:14 2007
@@ -14,9 +14,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package wicket.model;
+package org.apache.wicket.model;
 
-import wicket.Component;
+import org.apache.wicket.Component;
 
 
 /**
@@ -61,7 +61,7 @@
 	}
 
 	/**
-	 * @see wicket.model.IDetachable#detach()
+	 * @see org.apache.wicket.model.IDetachable#detach()
 	 */
 	public void detach()
 	{

Copied: incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/org/apache/wicket/model/AbstractWrapModel.java (from r527216, incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/wicket/model/AbstractWrapModel.java)
URL: http://svn.apache.org/viewvc/incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/org/apache/wicket/model/AbstractWrapModel.java?view=diff&rev=527232&p1=incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/wicket/model/AbstractWrapModel.java&r1=527216&p2=incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/org/apache/wicket/model/AbstractWrapModel.java&r2=527232
==============================================================================
--- incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/wicket/model/AbstractWrapModel.java (original)
+++ incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/org/apache/wicket/model/AbstractWrapModel.java Tue Apr 10 11:15:14 2007
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package wicket.model;
+package org.apache.wicket.model;
 
 /**
  * Simple base class for IWrapModel objects see {@link IComponentAssignedModel}
@@ -26,7 +26,7 @@
 public abstract class AbstractWrapModel implements IWrapModel
 {
 	/**
-	 * @see wicket.model.IModel#getObject()
+	 * @see org.apache.wicket.model.IModel#getObject()
 	 */
 	public Object getObject()
 	{
@@ -34,14 +34,14 @@
 	}
 
 	/**
-	 * @see wicket.model.IModel#setObject(java.lang.Object)
+	 * @see org.apache.wicket.model.IModel#setObject(java.lang.Object)
 	 */
 	public void setObject(Object object)
 	{
 	}
 
 	/**
-	 * @see wicket.model.IDetachable#detach()
+	 * @see org.apache.wicket.model.IDetachable#detach()
 	 */
 	public void detach()
 	{

Copied: incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/org/apache/wicket/model/BoundCompoundPropertyModel.java (from r527216, incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/wicket/model/BoundCompoundPropertyModel.java)
URL: http://svn.apache.org/viewvc/incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/org/apache/wicket/model/BoundCompoundPropertyModel.java?view=diff&rev=527232&p1=incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/wicket/model/BoundCompoundPropertyModel.java&r1=527216&p2=incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/org/apache/wicket/model/BoundCompoundPropertyModel.java&r2=527232
==============================================================================
--- incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/wicket/model/BoundCompoundPropertyModel.java (original)
+++ incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/org/apache/wicket/model/BoundCompoundPropertyModel.java Tue Apr 10 11:15:14 2007
@@ -14,12 +14,13 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package wicket.model;
+package org.apache.wicket.model;
 
 import java.util.ArrayList;
 
-import wicket.Component;
-import wicket.IClusterable;
+import org.apache.wicket.Component;
+import org.apache.wicket.IClusterable;
+
 
 /**
  * A compound property model that supports type conversions and property
@@ -126,7 +127,7 @@
 	}
 
 	/**
-	 * @see wicket.model.CompoundPropertyModel#detach()
+	 * @see org.apache.wicket.model.CompoundPropertyModel#detach()
 	 */
 	public void detach()
 	{
@@ -137,7 +138,7 @@
 	}
 
 	/**
-	 * @see wicket.model.AbstractDetachableModel#toString()
+	 * @see org.apache.wicket.model.AbstractDetachableModel#toString()
 	 */
 	public String toString()
 	{
@@ -174,7 +175,7 @@
 	}
 
 	/**
-	 * @see wicket.model.AbstractPropertyModel#propertyExpression(wicket.Component)
+	 * @see org.apache.wicket.model.AbstractPropertyModel#propertyExpression(org.apache.wicket.Component)
 	 */
 	protected String propertyExpression(final Component component)
 	{

Copied: incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/org/apache/wicket/model/ComponentPropertyModel.java (from r527216, incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/wicket/model/ComponentPropertyModel.java)
URL: http://svn.apache.org/viewvc/incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/org/apache/wicket/model/ComponentPropertyModel.java?view=diff&rev=527232&p1=incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/wicket/model/ComponentPropertyModel.java&r1=527216&p2=incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/org/apache/wicket/model/ComponentPropertyModel.java&r2=527232
==============================================================================
--- incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/wicket/model/ComponentPropertyModel.java (original)
+++ incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/org/apache/wicket/model/ComponentPropertyModel.java Tue Apr 10 11:15:14 2007
@@ -14,10 +14,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package wicket.model;
+package org.apache.wicket.model;
 
-import wicket.Component;
-import wicket.util.lang.PropertyResolver;
+import org.apache.wicket.Component;
+import org.apache.wicket.util.lang.PropertyResolver;
 
 /**
  * A model that references a property by name on the current model of the
@@ -47,7 +47,7 @@
 	}
 
 	/**
-	 * @see wicket.model.AbstractReadOnlyModel#getObject()
+	 * @see org.apache.wicket.model.AbstractReadOnlyModel#getObject()
 	 */
 	public Object getObject()
 	{
@@ -55,7 +55,7 @@
 	}
 
 	/**
-	 * @see wicket.model.IComponentAssignedModel#wrapOnAssignment(wicket.Component)
+	 * @see org.apache.wicket.model.IComponentAssignedModel#wrapOnAssignment(org.apache.wicket.Component)
 	 */
 	public IWrapModel wrapOnAssignment(final Component component)
 	{
@@ -82,7 +82,7 @@
 		}
 
 		/**
-		 * @see wicket.model.IWrapModel#getWrappedModel()
+		 * @see org.apache.wicket.model.IWrapModel#getWrappedModel()
 		 */
 		public IModel getWrappedModel()
 		{

Copied: incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/org/apache/wicket/model/CompoundPropertyModel.java (from r527216, incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/wicket/model/CompoundPropertyModel.java)
URL: http://svn.apache.org/viewvc/incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/org/apache/wicket/model/CompoundPropertyModel.java?view=diff&rev=527232&p1=incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/wicket/model/CompoundPropertyModel.java&r1=527216&p2=incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/org/apache/wicket/model/CompoundPropertyModel.java&r2=527232
==============================================================================
--- incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/wicket/model/CompoundPropertyModel.java (original)
+++ incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/org/apache/wicket/model/CompoundPropertyModel.java Tue Apr 10 11:15:14 2007
@@ -14,10 +14,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package wicket.model;
+package org.apache.wicket.model;
 
-import wicket.Component;
-import wicket.util.string.AppendingStringBuffer;
+import org.apache.wicket.Component;
+import org.apache.wicket.util.string.AppendingStringBuffer;
 
 /**
  * A simple compound model which uses the component's name as the property
@@ -26,9 +26,9 @@
  * CompoundPropertyModel is a chaining model so it will call get/setobject
  * on the given object if the object is an instanceof IModel itself.
  * 
- * @see wicket.model.IModel
- * @see wicket.model.Model
- * @see wicket.model.AbstractDetachableModel
+ * @see org.apache.wicket.model.IModel
+ * @see org.apache.wicket.model.Model
+ * @see org.apache.wicket.model.AbstractDetachableModel
  * @see IChainingModel
  * 
  * @author Jonathan Locke
@@ -51,7 +51,7 @@
 	}
 
 	/**
-	 * @see wicket.model.IModel#getObject()
+	 * @see org.apache.wicket.model.IModel#getObject()
 	 */
 	public Object getObject()
 	{
@@ -63,7 +63,7 @@
 	}
 
 	/**
-	 * @see wicket.model.IModel#setObject(java.lang.Object)
+	 * @see org.apache.wicket.model.IModel#setObject(java.lang.Object)
 	 */
 	public void setObject(Object object)
 	{
@@ -78,7 +78,7 @@
 	}
 	
 	/**
-	 * @see wicket.model.IChainingModel#getChainedModel()
+	 * @see org.apache.wicket.model.IChainingModel#getChainedModel()
 	 */
 	public IModel getChainedModel()
 	{
@@ -90,7 +90,7 @@
 	}
 	
 	/**
-	 * @see wicket.model.IChainingModel#setChainedModel(wicket.model.IModel)
+	 * @see org.apache.wicket.model.IChainingModel#setChainedModel(org.apache.wicket.model.IModel)
 	 */
 	public void setChainedModel(IModel model)
 	{
@@ -98,7 +98,7 @@
 	}
 
 	/**
-	 * @see wicket.model.IDetachable#detach()
+	 * @see org.apache.wicket.model.IDetachable#detach()
 	 */
 	public void detach()
 	{
@@ -121,7 +121,7 @@
 	}
 
 	/**
-	 * @see wicket.model.IComponentInheritedModel#wrapOnInheritance(wicket.Component)
+	 * @see org.apache.wicket.model.IComponentInheritedModel#wrapOnInheritance(org.apache.wicket.Component)
 	 */
 	public IWrapModel wrapOnInheritance(Component component)
 	{
@@ -169,7 +169,7 @@
 		}
 
 		/**
-		 * @see wicket.model.AbstractPropertyModel#propertyExpression()
+		 * @see org.apache.wicket.model.AbstractPropertyModel#propertyExpression()
 		 */
 		protected String propertyExpression()
 		{
@@ -177,7 +177,7 @@
 		}
 
 		/**
-		 * @see wicket.model.IWrapModel#getWrappedModel()
+		 * @see org.apache.wicket.model.IWrapModel#getWrappedModel()
 		 */
 		public IModel getWrappedModel()
 		{
@@ -185,7 +185,7 @@
 		}
 
 		/**
-		 * @see wicket.model.AbstractPropertyModel#detach()
+		 * @see org.apache.wicket.model.AbstractPropertyModel#detach()
 		 */
 		public void detach()
 		{

Copied: incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/org/apache/wicket/model/IChainingModel.java (from r527216, incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/wicket/model/IChainingModel.java)
URL: http://svn.apache.org/viewvc/incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/org/apache/wicket/model/IChainingModel.java?view=diff&rev=527232&p1=incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/wicket/model/IChainingModel.java&r1=527216&p2=incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/org/apache/wicket/model/IChainingModel.java&r2=527232
==============================================================================
--- incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/wicket/model/IChainingModel.java (original)
+++ incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/org/apache/wicket/model/IChainingModel.java Tue Apr 10 11:15:14 2007
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package wicket.model;
+package org.apache.wicket.model;
 
 /**
  * Models who implement this interface will support chaining of IModels.

Copied: incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/org/apache/wicket/model/IComponentAssignedModel.java (from r527216, incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/wicket/model/IComponentAssignedModel.java)
URL: http://svn.apache.org/viewvc/incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/org/apache/wicket/model/IComponentAssignedModel.java?view=diff&rev=527232&p1=incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/wicket/model/IComponentAssignedModel.java&r1=527216&p2=incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/org/apache/wicket/model/IComponentAssignedModel.java&r2=527232
==============================================================================
--- incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/wicket/model/IComponentAssignedModel.java (original)
+++ incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/org/apache/wicket/model/IComponentAssignedModel.java Tue Apr 10 11:15:14 2007
@@ -14,9 +14,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package wicket.model;
+package org.apache.wicket.model;
 
-import wicket.Component;
+import org.apache.wicket.Component;
 
 /**
  * Models that wish to substitute themselves with a wrapper when they are bound
@@ -25,7 +25,7 @@
  * One reason for a model to want to do this is if it needs to be aware of the
  * component it is bound to.
  * 
- * The algorithm wicket employes is similar to this:
+ * The algorithm org.apache.wicket employes is similar to this:
  * 
  * <pre>
  * void Component.setModel(IModel model) 

Copied: incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/org/apache/wicket/model/IComponentInheritedModel.java (from r527216, incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/wicket/model/IComponentInheritedModel.java)
URL: http://svn.apache.org/viewvc/incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/org/apache/wicket/model/IComponentInheritedModel.java?view=diff&rev=527232&p1=incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/wicket/model/IComponentInheritedModel.java&r1=527216&p2=incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/org/apache/wicket/model/IComponentInheritedModel.java&r2=527232
==============================================================================
--- incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/wicket/model/IComponentInheritedModel.java (original)
+++ incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/org/apache/wicket/model/IComponentInheritedModel.java Tue Apr 10 11:15:14 2007
@@ -14,9 +14,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package wicket.model;
+package org.apache.wicket.model;
 
-import wicket.Component;
+import org.apache.wicket.Component;
 
 /**
  * This is a marker interface for models that can be inherited from components

Copied: incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/org/apache/wicket/model/IDetachable.java (from r527216, incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/wicket/model/IDetachable.java)
URL: http://svn.apache.org/viewvc/incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/org/apache/wicket/model/IDetachable.java?view=diff&rev=527232&p1=incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/wicket/model/IDetachable.java&r1=527216&p2=incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/org/apache/wicket/model/IDetachable.java&r2=527232
==============================================================================
--- incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/wicket/model/IDetachable.java (original)
+++ incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/org/apache/wicket/model/IDetachable.java Tue Apr 10 11:15:14 2007
@@ -14,9 +14,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package wicket.model;
+package org.apache.wicket.model;
 
-import wicket.IClusterable;
+import org.apache.wicket.IClusterable;
 
 /**
  * Interface to logic for detaching transient information from a detachable