You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@wicket.apache.org by eh...@apache.org on 2007/04/11 00:36:47 UTC
svn commit: r527326 [2/4] - in /incubator/wicket/branches/wicket-1.x:
jdk-1.4/wicket-datetime/src/test/java/org/apache/wicket/util/license/
jdk-1.4/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/
jdk-1.4/wicket-extensions...
Modified: incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/parser/filter/EnclosureHandler.java
URL: http://svn.apache.org/viewvc/incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/parser/filter/EnclosureHandler.java?view=diff&rev=527326&r1=527325&r2=527326
==============================================================================
--- incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/parser/filter/EnclosureHandler.java (original)
+++ incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/parser/filter/EnclosureHandler.java Tue Apr 10 15:36:37 2007
@@ -27,12 +27,12 @@
/**
- * This is a markup inline filter. It identifies <org.apache.wicket:enclosure> tags.
+ * This is a markup inline filter. It identifies <wicket:enclosure> tags.
* If the 'child' attribute is empty it determines the wicket:id of the child
* component automatically by analysing the org.apache.wicket component (in this case on
* one org.apache.wicket component is allowed) in between the open and close tags. If the
* enclosure tag has a 'child' attribute like
- * <code><org.apache.wicket:enclosure child="xxx"></code> than more than just one
+ * <code><wicket:enclosure child="xxx"></code> than more than just one
* org.apache.wicket component inside the enclosure tags are allowed and the child
* component which determines the visibility of the enclosure is identified by
* the 'child' attribute value which must be equal to the relative child id
@@ -50,11 +50,11 @@
static
{
- // register "org.apache.wicket:enclosure"
+ // register "wicket:enclosure"
WicketTagIdentifier.registerWellKnownTagName("enclosure");
}
- /** Stack of <org.apache.wicket:enclosure> tags */
+ /** Stack of <wicket:enclosure> tags */
private Stack/* <ComponentTag> */stack;
/** The id of the first org.apache.wicket tag inside the enclosure */
@@ -83,7 +83,7 @@
final boolean isWicketTag = tag instanceof WicketTag;
final boolean isEnclosureTag = isWicketTag && ((WicketTag)tag).isEnclosureTag();
- // If org.apache.wicket:enclosure
+ // If wicket:enclosure
if (isEnclosureTag)
{
// If open tag, than put the tag onto the stack
@@ -128,7 +128,7 @@
+ tag.toString(), tag.getPos());
}
}
- // Are we inside a org.apache.wicket:enclosure tag?
+ // Are we inside a wicket:enclosure tag?
else if ((tag.getId() != null) && (isWicketTag == false) && (stack != null))
{
ComponentTag lastEnclosure = (ComponentTag)this.stack.lastElement();
@@ -143,7 +143,7 @@
if (this.childId != null)
{
throw new ParseException(
- "Use <org.apache.wicket:enclosure child='xxx'> to name the child component", tag
+ "Use <wicket:enclosure child='xxx'> to name the child component", tag
.getPos());
}
// Remember the child id. The open tag will be updated
Modified: incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/parser/filter/HeadForceTagIdHandler.java
URL: http://svn.apache.org/viewvc/incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/parser/filter/HeadForceTagIdHandler.java?view=diff&rev=527326&r1=527325&r2=527326
==============================================================================
--- incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/parser/filter/HeadForceTagIdHandler.java (original)
+++ incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/parser/filter/HeadForceTagIdHandler.java Tue Apr 10 15:36:37 2007
@@ -27,7 +27,7 @@
/**
* Handler that sets unique tag id for every inline script and style element in
- * <org.apache.wicket:head>, unless the element already has one. <br/> This is needed
+ * <wicket:head>, unless the element already has one. <br/> This is needed
* to be able to dedect multiple ajax header contribution. Tags that are not
* inline (stript with src attribute set and link with href attribute set) do
* not require id, because the detection is done by comparing URLs.
@@ -46,7 +46,7 @@
/** Unique value per markup file */
private int counter = 0;
- /** we are in org.apache.wicket:head */
+ /** we are in wicket:head */
private boolean inHead = false;
/**
@@ -80,12 +80,12 @@
if (tag != null)
{
- // is it a <org.apache.wicket:head> tag?
+ // is it a <wicket:head> tag?
if (tag instanceof WicketTag && ((WicketTag)tag).isHeadTag())
{
this.inHead = tag.isOpen();
}
- // no, it's not. Are we in <org.apache.wicket:head> ?
+ // no, it's not. Are we in <wicket:head> ?
else if (this.inHead == true)
{
// is the tag open and has empty wicket:id?
Modified: incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/parser/filter/HtmlHeaderSectionHandler.java
URL: http://svn.apache.org/viewvc/incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/parser/filter/HtmlHeaderSectionHandler.java?view=diff&rev=527326&r1=527325&r2=527326
==============================================================================
--- incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/parser/filter/HtmlHeaderSectionHandler.java (original)
+++ incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/parser/filter/HtmlHeaderSectionHandler.java Tue Apr 10 15:36:37 2007
@@ -28,7 +28,7 @@
/**
* This is a markup inline filter. It assumes that WicketTagIdentifier has been
- * called first and search for a <head> tag (note: not org.apache.wicket:head).
+ * called first and search for a <head> tag (note: not wicket:head).
* Provided the markup contains a <body> tag it will automatically prepend
* a <head> tag if missing.
* <p>
@@ -109,7 +109,7 @@
}
else
{
- // we found <org.apache.wicket:head>
+ // we found <wicket:head>
foundHead = true;
}
}
Modified: incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/parser/filter/HtmlProblemFinder.java
URL: http://svn.apache.org/viewvc/incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/parser/filter/HtmlProblemFinder.java?view=diff&rev=527326&r1=527325&r2=527326
==============================================================================
--- incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/parser/filter/HtmlProblemFinder.java (original)
+++ incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/parser/filter/HtmlProblemFinder.java Tue Apr 10 15:36:37 2007
@@ -27,9 +27,10 @@
/**
- * This is a markup inline filter which by default is not added to the list
- * of markup filter. It can be added by means of subclassing
- * Application.newMarkupParser() like
+ * This is a markup inline filter which by default is not added to the list of
+ * markup filter. It can be added by means of subclassing
+ * Application.newMarkupParser() like
+ *
* <pre>
* public class MyApplication extends Application
* {
@@ -40,7 +41,7 @@
* }
* </pre>
*
- * The purpose of the filter is to find possible HTML issues and to log a
+ * The purpose of the filter is to find possible HTML issues and to log a
* warning.
*
* @author Juergen Donnerstag
@@ -51,20 +52,20 @@
private static final Log log = LogFactory.getLog(HtmlProblemFinder.class);
/** Ignore the issue detected */
- public static final int ERR_INGORE = 3;
-
+ public static final int ERR_INGORE = 3;
+
/** Log a warning on the issue detected */
- public static final int ERR_LOG_WARN = 2;
-
+ public static final int ERR_LOG_WARN = 2;
+
/** Log an error on the issue detected */
- public static final int ERR_LOG_ERROR = 1;
-
+ public static final int ERR_LOG_ERROR = 1;
+
/** Throw an exception on the issue detected */
public static final int ERR_THROW_EXCEPTION = 0;
-
+
/** Default behavior in case of a potential HTML issue detected */
- private final int problemEscalation;
-
+ private final int problemEscalation;
+
/**
* Construct.
*
@@ -94,19 +95,19 @@
return tag;
}
- // Make sure some typical and may be tricky problems are detected and
+ // Make sure some typical and may be tricky problems are detected and
// logged.
if ("img".equals(tag.getName()) && (tag.isOpen() || tag.isOpenClose()))
- {
- String src = tag.getAttributes().getString("src");
- if ((src != null) && (src.trim().length() == 0))
- {
- escalateWarning("Attribute 'src' should not be empty. Location: ",
- tag);
- }
- }
+ {
+ String src = tag.getAttributes().getString("src");
+ if ((src != null) && (src.trim().length() == 0))
+ {
+ escalateWarning("Attribute 'src' should not be empty. Location: ", tag);
+ }
+ }
- // Some people are using a dot "org.apache.wicket.xxx" instead of a colon "org.apache.wicket:xxx"
+ // Some people are using a dot "wicket.xxx" instead of a colon
+ // "wicket:xxx"
Iterator iter = tag.getAttributes().keySet().iterator();
while (iter.hasNext())
{
@@ -114,14 +115,15 @@
if (key != null)
{
key = key.toLowerCase();
- if (key.startsWith("org.apache.wicket."))
+ if (key.startsWith("wicket."))
{
- escalateWarning("You probably want 'org.apache.wicket:xxx' rather than 'org.apache.wicket.xxx'. Location: ",
- tag);
+ escalateWarning(
+ "You probably want 'wicket:xxx' rather than 'wicket.xxx'. Location: ",
+ tag);
}
}
}
-
+
return tag;
}
@@ -129,27 +131,30 @@
* Handle the issue. Depending the setting either log a warning, an error,
* throw an exception or ignore it.
*
- * @param msg The message
- * @param tag The current tag
+ * @param msg
+ * The message
+ * @param tag
+ * The current tag
* @throws ParseException
*/
private void escalateWarning(final String msg, final ComponentTag tag) throws ParseException
{
- if (problemEscalation == ERR_LOG_WARN)
- {
- log.warn(msg + tag.toUserDebugString());
- }
- else if (problemEscalation == ERR_LOG_ERROR)
- {
- log.error(msg + tag.toUserDebugString());
- }
- else if (problemEscalation == ERR_INGORE)
- {
- // no action required
- }
- else // if (problemEscalation == ERR_THROW_EXCEPTION)
- {
- throw new ParseException(msg + tag.toUserDebugString(), tag.getPos());
- }
+ if (problemEscalation == ERR_LOG_WARN)
+ {
+ log.warn(msg + tag.toUserDebugString());
+ }
+ else if (problemEscalation == ERR_LOG_ERROR)
+ {
+ log.error(msg + tag.toUserDebugString());
+ }
+ else if (problemEscalation == ERR_INGORE)
+ {
+ // no action required
+ }
+ else
+ // if (problemEscalation == ERR_THROW_EXCEPTION)
+ {
+ throw new ParseException(msg + tag.toUserDebugString(), tag.getPos());
+ }
}
}
Modified: incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/parser/filter/WicketLinkTagHandler.java
URL: http://svn.apache.org/viewvc/incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/parser/filter/WicketLinkTagHandler.java?view=diff&rev=527326&r1=527325&r2=527326
==============================================================================
--- incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/parser/filter/WicketLinkTagHandler.java (original)
+++ incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/parser/filter/WicketLinkTagHandler.java Tue Apr 10 15:36:37 2007
@@ -37,11 +37,11 @@
* the href and assign a BookmarkablePageLink to it (automatically).
* <p>
* An application setting is used as default value, which might be modified for
- * specific regions. These regions are identified by <org.apache.wicket:link> tags
+ * specific regions. These regions are identified by <wicket:link> tags
* with an optional 'autolink' attribute. The default value for the attribute is
- * true, thus enabling autolinking. An open-close <org.apache.wicket:link/> tag will
+ * true, thus enabling autolinking. An open-close <wicket:link/> tag will
* change the autolink status until the end of the markup document or the next
- * <org.apache.wicket:link> tag respectively. <org.apache.wicket:link> regions may be
+ * <wicket:link> tag respectively. <wicket:link> regions may be
* nested.
*
* @author Juergen Donnerstag
@@ -53,7 +53,7 @@
static
{
- // register "org.apache.wicket:fragement"
+ // register "wicket:fragement"
WicketTagIdentifier.registerWellKnownTagName("link");
}
@@ -117,7 +117,7 @@
return tag;
}
- // For all <org.apache.wicket:link ..> tags which probably change the
+ // For all <wicket:link ..> tags which probably change the
// current autolink status.
if (tag instanceof WicketTag)
{
Modified: incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/parser/filter/WicketMessageTagHandler.java
URL: http://svn.apache.org/viewvc/incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/parser/filter/WicketMessageTagHandler.java?view=diff&rev=527326&r1=527325&r2=527326
==============================================================================
--- incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/parser/filter/WicketMessageTagHandler.java (original)
+++ incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/parser/filter/WicketMessageTagHandler.java Tue Apr 10 15:36:37 2007
@@ -35,13 +35,13 @@
/**
* This is a markup inline filter and a component resolver. It identifies
- * org.apache.wicket:message attributes and adds an attribute modifier to the component tag
+ * wicket:message attributes and adds an attribute modifier to the component tag
* that can localize
- * org.apache.wicket:message="attr-name:i18n-key,attr-name-2:i18n-key-2,..." expressions,
+ * wicket:message="attr-name:i18n-key,attr-name-2:i18n-key-2,..." expressions,
* replacing values of attributes specified by attr-name with a localizer lookup
* with key i18n-key. If an attribute being localized has a set value that value
* will be used as the default value for the localization lookup. This handler
- * also resolves and localizes raw markup with org.apache.wicket:message attribute.
+ * also resolves and localizes raw markup with wicket:message attribute.
*
* @author Juergen Donnerstag
* @author Igor Vaynberg
@@ -56,10 +56,10 @@
private static final long serialVersionUID = 1L;
/** TODO Post 1.2: General: Namespace should not be a constant */
- private final static String WICKET_MESSAGE_ATTRIBUTE_NAME = "org.apache.wicket:message";
+ private final static String WICKET_MESSAGE_ATTRIBUTE_NAME = "wicket:message";
/**
- * The id automatically assigned to tags with org.apache.wicket:message attribute but
+ * The id automatically assigned to tags with wicket:message attribute but
* without id
*/
public final static String WICKET_MESSAGE_CONTAINER_ID = "-message_attr";
@@ -151,7 +151,7 @@
if (attrAndKey.length() < 3 || colon < 1 || colon > attrAndKey.length() - 2)
{
throw new WicketRuntimeException(
- "org.apache.wicket:message attribute contains an invalid value [[" + expr
+ "wicket:message attribute contains an invalid value [[" + expr
+ "]], must be of form (attr:key)+");
}
@@ -177,7 +177,7 @@
public boolean resolve(MarkupContainer container, MarkupStream markupStream, ComponentTag tag)
{
- // localize any raw markup that has org.apache.wicket:message attrs
+ // localize any raw markup that has wicket:message attrs
if (WICKET_MESSAGE_CONTAINER_ID.equals(tag.getId()))
{
Modified: incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/parser/filter/WicketNamespaceHandler.java
URL: http://svn.apache.org/viewvc/incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/parser/filter/WicketNamespaceHandler.java?view=diff&rev=527326&r1=527325&r2=527326
==============================================================================
--- incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/parser/filter/WicketNamespaceHandler.java (original)
+++ incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/parser/filter/WicketNamespaceHandler.java Tue Apr 10 15:36:37 2007
@@ -30,8 +30,8 @@
/**
* This is a markup inline filter. It determines the Wicket namespace name from
- * the markup Examples are xmlns:org.apache.wicket or
- * xmlns:org.apache.wicket="http://org.apache.wicket.sourceforge.net".
+ * the markup Examples are xmlns:wicket or
+ * xmlns:wicket="http://wicket.apache.org".
*
* @see org.apache.wicket.markup.MarkupParser
* @author Juergen Donnerstag
@@ -39,14 +39,14 @@
public final class WicketNamespaceHandler extends AbstractMarkupFilter
{
/** Wicket URI */
- private static final String WICKET_URI = "http://org.apache.wicket.sourceforge.net";
+ private static final String WICKET_URI = "http://wicket.apache.org";
/** The markup created by reading the markup file */
private final Markup markup;
/**
* namespace prefix: e.g. <html
- * xmlns:org.apache.wicket="http://org.apache.wicket.sourceforge.net">
+ * xmlns:wicket="http://wicket.apache.org">
*/
private static final String XMLNS = "xmlns:";
@@ -92,8 +92,8 @@
}
/**
- * Determine org.apache.wicket namespace from xmlns:org.apache.wicket or
- * xmlns:org.apache.wicket="http://org.apache.wicket.sourceforge.net"
+ * Determine org.apache.wicket namespace from xmlns:wicket or
+ * xmlns:wicket="http://wicket.apache.org"
*
* @param tag
* @return Wicket namespace
Modified: incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/parser/filter/WicketRemoveTagHandler.java
URL: http://svn.apache.org/viewvc/incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/parser/filter/WicketRemoveTagHandler.java?view=diff&rev=527326&r1=527325&r2=527326
==============================================================================
--- incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/parser/filter/WicketRemoveTagHandler.java (original)
+++ incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/parser/filter/WicketRemoveTagHandler.java Tue Apr 10 15:36:37 2007
@@ -27,7 +27,7 @@
/**
* This is a markup inline filter. It identifies preview regions useful for HTML
* designers to design the page. But they must be removed prior to sending the
- * markup to the client. Preview regions are enclosed by <org.apache.wicket:remove>
+ * markup to the client. Preview regions are enclosed by <wicket:remove>
* tags.
*
* @author Juergen Donnerstag
@@ -39,7 +39,7 @@
static
{
- // register "org.apache.wicket:fragement"
+ // register "wicket:fragement"
WicketTagIdentifier.registerWellKnownTagName("remove");
}
@@ -51,7 +51,7 @@
}
/**
- * Removes preview regions enclosed by <org.apache.wicket:remove> tags. Note that
+ * Removes preview regions enclosed by <wicket:remove> tags. Note that
* for obvious reasons, nested components are not allowed.
*
* @see org.apache.wicket.markup.parser.IMarkupFilter#nextTag()
Modified: incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/parser/filter/WicketTagIdentifier.java
URL: http://svn.apache.org/viewvc/incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/parser/filter/WicketTagIdentifier.java?view=diff&rev=527326&r1=527325&r2=527326
==============================================================================
--- incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/parser/filter/WicketTagIdentifier.java (original)
+++ incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/parser/filter/WicketTagIdentifier.java Tue Apr 10 15:36:37 2007
@@ -34,7 +34,7 @@
* for Wicket.
* <p>
* <ul>
- * <li>All tags with Wicket namespace, e.g. <org.apache.wicket:remove></li>
+ * <li>All tags with Wicket namespace, e.g. <wicket:remove></li>
* <li>All tags with an attribute like wicket:id="myLabel" </li>
* </ul>
*
@@ -89,7 +89,7 @@
ComponentTag tag;
if (namespace.equalsIgnoreCase(xmlTag.getNamespace()))
{
- // It is <org.apache.wicket:...>
+ // It is <wicket:...>
tag = new WicketTag(xmlTag);
// Make it a org.apache.wicket component. Otherwise it would be RawMarkup
Modified: incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/org/apache/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=527326&r1=527325&r2=527326
==============================================================================
--- incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/org/apache/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 15:36:37 2007
@@ -34,7 +34,7 @@
/**
- * <org.apache.wicket:component class="myApp.MyTable" key=value> tags may be used to add
+ * <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.
@@ -52,16 +52,16 @@
static
{
- // register "org.apache.wicket:fragement"
+ // register "wicket:fragement"
WicketTagIdentifier.registerWellKnownTagName("component");
}
/**
* Temporary storage for containers currently being rendered. Thus child
- * components can be re-parented. Remember: <org.apache.wicket:component> are an
+ * components can be re-parented. Remember: <wicket:component> are an
* exception to the rule. Though the markup of the children are nested
- * inside <org.apache.wicket:component>, their respective Java components are not.
- * They must be added to the parent container of <org.apache.wicket:component>.
+ * inside <wicket:component>, their respective Java components are not.
+ * They must be added to the parent container of <wicket:component>.
*/
private final Map nestedComponents = new HashMap();
@@ -80,10 +80,10 @@
public final boolean resolve(final MarkupContainer container, final MarkupStream markupStream,
final ComponentTag tag)
{
- // It must be <org.apache.wicket:...>
+ // It must be <wicket:...>
if (tag instanceof WicketTag)
{
- // It must be <org.apache.wicket:component...>
+ // It must be <wicket:component...>
final WicketTag wicketTag = (WicketTag)tag;
if (wicketTag.isComponentTag())
{
@@ -110,12 +110,12 @@
}
}
- // Re-parent children of <org.apache.wicket:component>.
+ // Re-parent children of <wicket:component>.
if ((tag.getId() != null) && nestedComponents.containsKey(container))
{
MarkupContainer parent = container.getParent();
- // Take care of nested <org.apache.wicket:component>
+ // Take care of nested <wicket:component>
while ((parent != null) && nestedComponents.containsKey(parent))
{
parent = parent.getParent();
@@ -158,7 +158,7 @@
final String classname = tag.getAttributes().getString("class");
if ((classname == null) || (classname.trim().length() == 0))
{
- throw new MarkupException("Tag <org.apache.wicket:component> must have attribute 'class'");
+ throw new MarkupException("Tag <wicket:component> must have attribute 'class'");
}
// Load the class. In case a Groovy Class Resolver has been provided,
Modified: incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/org/apache/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=527326&r1=527325&r2=527326
==============================================================================
--- incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/org/apache/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 15:36:37 2007
@@ -96,7 +96,7 @@
// Href is relative. Create a resource reference pointing at
// this file
- // <org.apache.wicket:head> components are handled differently. We can
+ // <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
Modified: incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/org/apache/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=527326&r1=527325&r2=527326
==============================================================================
--- incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/org/apache/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 15:36:37 2007
@@ -25,7 +25,7 @@
/**
* This is a tag resolver which automatically adds a Enclosure container for
- * each <org.apache.wicket:enclosure> tag. As this is no default resolver, it must be
+ * each <wicket:enclosure> tag. As this is no default resolver, it must be
* added manually:
*
* @see EnclosureHandler
Modified: incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/org/apache/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=527326&r1=527325&r2=527326
==============================================================================
--- incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/org/apache/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 15:36:37 2007
@@ -42,7 +42,7 @@
static
{
- // register "org.apache.wicket:fragement"
+ // register "wicket:fragement"
WicketTagIdentifier.registerWellKnownTagName("fragment");
}
@@ -61,12 +61,12 @@
public boolean resolve(final MarkupContainer container, final MarkupStream markupStream,
final ComponentTag tag)
{
- // If <org.apache.wicket:...>
+ // If <wicket:...>
if (tag instanceof WicketTag)
{
final WicketTag wTag = (WicketTag)tag;
- // If <org.apache.wicket:fragment ...>
+ // If <wicket:fragment ...>
if (wTag.isFragementTag())
{
// skip the markup associated with the tag
Modified: incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/org/apache/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=527326&r1=527325&r2=527326
==============================================================================
--- incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/org/apache/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 15:36:37 2007
@@ -30,7 +30,7 @@
/**
* This is a tag resolver which handles <head> and
- * <org.apache.wicket:head>tags. It must be registered (with the application) and
+ * <wicket:head>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 <org.apache.wicket:head> a simple WebMarkupContainer handles the tag.
+ * In case of <wicket:head> a simple WebMarkupContainer handles the tag.
*
* @author Juergen Donnerstag
*/
@@ -49,7 +49,7 @@
static
{
- // register "org.apache.wicket:head"
+ // register "wicket:head"
WicketTagIdentifier.registerWellKnownTagName("head");
}
@@ -85,8 +85,8 @@
}
else if ((tag instanceof WicketTag) && ((WicketTag)tag).isHeadTag())
{
- // 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
+ // If we found <wicket:head> without surrounding <head> on a Page,
+ // than we have to add 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 <org.apache.wicket:head>. Because they do not provide any additional
+ // It is <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 <org.apache.wicket:head>. Because they do not provide any additional
+ // It is <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 <org.apache.wicket:head>. <org.apache.wicket:head> must be outside of <org.apache.wicket:panel> and <org.apache.wicket:border>");
+ "Mis-placed <wicket:head>. <wicket:head> must be outside of <wicket:panel> and <wicket:border>");
}
// Yes, we handled the tag
Modified: incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/org/apache/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=527326&r1=527325&r2=527326
==============================================================================
--- incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/org/apache/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 15:36:37 2007
@@ -24,7 +24,7 @@
import org.apache.wicket.markup.parser.filter.WicketTagIdentifier;
/**
- * Detect <org.apache.wicket:extend> and <org.apache.wicket:child> tags,
+ * Detect <wicket:extend> and <wicket:child> tags,
* which are silently ignored, because they have already been processed.
*
* @author Juergen Donnerstag
@@ -35,7 +35,7 @@
static
{
- // register "org.apache.wicket:fragement"
+ // register "wicket:fragement"
WicketTagIdentifier.registerWellKnownTagName("extend");
WicketTagIdentifier.registerWellKnownTagName("child");
}
@@ -54,19 +54,19 @@
public boolean resolve(final MarkupContainer container, final MarkupStream markupStream,
final ComponentTag tag)
{
- // It must be <org.apache.wicket:...>
+ // It must be <wicket:...>
if (tag instanceof WicketTag)
{
final WicketTag wicketTag = (WicketTag)tag;
- // It must be <org.apache.wicket:extend...>
+ // It must be <wicket:extend...>
if (wicketTag.isExtendTag())
{
container.autoAdd(new TransparentWebMarkupContainer(wicketTag.getId()));
return true;
}
- // It must be <org.apache.wicket:child...>
+ // It must be <wicket:child...>
if (wicketTag.isChildTag())
{
container.autoAdd(new TransparentWebMarkupContainer(wicketTag.getId()));
Modified: incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/org/apache/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=527326&r1=527325&r2=527326
==============================================================================
--- incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/org/apache/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 15:36:37 2007
@@ -25,7 +25,7 @@
/**
- * This is a tag resolver which handles <org.apache.wicket:container>
+ * This is a tag resolver which handles <wicket:container>
*
* 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,10 +46,10 @@
*
* <code>
* <table>
- * <org.apache.wicket:container wicket:id="repeater">
+ * <wicket:container wicket:id="repeater">
* <tr><td>...</td></tr>
* <tr><td>...</td></tr>
- * </org.apache.wicket:container>
+ * </wicket:container>
* </table>
* </code>
*
@@ -63,7 +63,7 @@
static
{
- // register "org.apache.wicket:container"
+ // register "wicket:container"
WicketTagIdentifier.registerWellKnownTagName("container");
}
@@ -88,7 +88,7 @@
public boolean resolve(final MarkupContainer container, final MarkupStream markupStream,
final ComponentTag tag)
{
- // this is only here so we register org.apache.wicket:container tag, this resolver
+ // this is only here so we register wicket:container tag, this resolver
// does not actually do anything special to the tag
return false;
}
Modified: incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/org/apache/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=527326&r1=527325&r2=527326
==============================================================================
--- incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/org/apache/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 15:36:37 2007
@@ -24,7 +24,7 @@
import org.apache.wicket.markup.html.WebMarkupContainer;
/**
- * This is a tag resolver which handles <org.apache.wicket:link> tags. Because
+ * This is a tag resolver which handles <wicket:link> 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.
Modified: incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/org/apache/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=527326&r1=527325&r2=527326
==============================================================================
--- incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/org/apache/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 15:36:37 2007
@@ -31,9 +31,9 @@
/**
- * This is a tag resolver which handles <org.apache.wicket:message
- * attr="myKey">Default Text</org.apache.wicket:message>. The resolver will
- * replace the whole tag with the message found in the properties file
+ * This is a tag resolver which handles <wicket:message
+ * attr="myKey">Default Text</wicket:message>. 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.
*
@@ -42,14 +42,14 @@
public class WicketMessageResolver implements IComponentResolver
{
private static final Log log = LogFactory.getLog(WicketMessageResolver.class);
-
+
static
{
- // register "org.apache.wicket:message"
+ // register "wicket:message"
WicketTagIdentifier.registerWellKnownTagName("message");
}
-
+
private static final long serialVersionUID = 1L;
/**
@@ -80,11 +80,11 @@
if ((messageKey == null) || (messageKey.trim().length() == 0))
{
throw new MarkupException(
- "Wrong format of <org.apache.wicket:message key='xxx'>: attribute 'key' is missing");
+ "Wrong format of <wicket:message key='xxx'>: attribute 'key' is missing");
}
- final String value = container.getApplication().getResourceSettings().getLocalizer()
- .getString(messageKey, container, "");
+ final String value = container.getApplication().getResourceSettings()
+ .getLocalizer().getString(messageKey, container, "");
final String id = "_message_" + container.getPage().getAutoIndex();
Component component = null;
@@ -137,8 +137,8 @@
*/
protected void onComponentTag(ComponentTag tag)
{
- // Convert <org.apache.wicket:message /> into
- // <org.apache.wicket:message>...</org.apache.wicket:message>
+ // Convert <wicket:message /> into
+ // <wicket:message>...</wicket:message>
if (tag.isOpenClose())
{
tag.setType(XmlTag.OPEN);
Modified: incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/org/apache/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=527326&r1=527325&r2=527326
==============================================================================
--- incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/org/apache/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 15:36:37 2007
@@ -62,7 +62,7 @@
*/
public void onComponentTag(final Component component, final ComponentTag tag)
{
- tag.put("xmlns:org.apache.wicket", "http://org.apache.wicket.sourceforge.net");
+ tag.put("xmlns:wicket", "http://wicket.apache.org");
final RequestCycle requestCycle = RequestCycle.get();
Modified: incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/org/apache/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=527326&r1=527325&r2=527326
==============================================================================
--- incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/org/apache/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 15:36:37 2007
@@ -30,7 +30,7 @@
* 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:org.apache.wicket="http://org.apache.wicket.sourceforge.net"</code> is added to the
+ * <code>xmlns:wicket="http://wicket.apache.org"</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
@@ -71,7 +71,7 @@
// 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")));
+ add(new AttributeModifier("xmlns:wicket", true, new Model("http://wicket.apache.org")));
}
/**
Modified: incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/org/apache/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=527326&r1=527325&r2=527326
==============================================================================
--- incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/org/apache/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 15:36:37 2007
@@ -28,8 +28,9 @@
* 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: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.
+ * <code>xmlns:wicket="http://wicket.apache.org"</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
@@ -72,9 +73,10 @@
*/
public void onComponentTag(final Component component, final ComponentTag tag)
{
- tag.put("xmlns:org.apache.wicket", "http://org.apache.wicket.sourceforge.net");
+ tag.put("xmlns:wicket", "http://wicket.apache.org");
- // Make the XSLT processor happy and allow it to handle the org.apache.wicket
+ // 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);
}
Modified: incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/org/apache/wicket/protocol/http/WebApplication.java
URL: http://svn.apache.org/viewvc/incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/org/apache/wicket/protocol/http/WebApplication.java?view=diff&rev=527326&r1=527325&r2=527326
==============================================================================
--- incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/org/apache/wicket/protocol/http/WebApplication.java (original)
+++ incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/org/apache/wicket/protocol/http/WebApplication.java Tue Apr 10 15:36:37 2007
@@ -222,7 +222,7 @@
{
throw new WicketRuntimeException("unable to retrieve servlet path");
}
- sessionAttributePrefix = "org.apache.wicket:" + servletPath + ":";
+ sessionAttributePrefix = "wicket:" + servletPath + ":";
}
// Namespacing for session attributes is provided by
// adding the servlet path
@@ -557,7 +557,7 @@
String configuration = null;
try
{
- configuration = System.getProperty("org.apache.wicket." + Application.CONFIGURATION);
+ configuration = System.getProperty("wicket." + Application.CONFIGURATION);
}
catch (SecurityException e)
{
Modified: incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/org/apache/wicket/protocol/http/WicketFilter.java
URL: http://svn.apache.org/viewvc/incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/org/apache/wicket/protocol/http/WicketFilter.java?view=diff&rev=527326&r1=527325&r2=527326
==============================================================================
--- incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/org/apache/wicket/protocol/http/WicketFilter.java (original)
+++ incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/org/apache/wicket/protocol/http/WicketFilter.java Tue Apr 10 15:36:37 2007
@@ -379,7 +379,7 @@
// Store instance of this application object in servlet context to
// make integration with outside world easier
- String contextKey = "org.apache.wicket:" + filterConfig.getFilterName();
+ String contextKey = "wicket:" + filterConfig.getFilterName();
filterConfig.getServletContext().setAttribute(contextKey, this.webApplication);
Application.set(webApplication);
Modified: incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/org/apache/wicket/protocol/http/request/WebRequestCodingStrategy.java
URL: http://svn.apache.org/viewvc/incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/org/apache/wicket/protocol/http/request/WebRequestCodingStrategy.java?view=diff&rev=527326&r1=527325&r2=527326
==============================================================================
--- incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/org/apache/wicket/protocol/http/request/WebRequestCodingStrategy.java (original)
+++ incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/org/apache/wicket/protocol/http/request/WebRequestCodingStrategy.java Tue Apr 10 15:36:37 2007
@@ -335,7 +335,7 @@
else if (url.length() > 0 && url.charAt(0) == '?')
{
// Keep the last part of mounted pages for resource/interface links.
- // E.g. if we generate app/Clients we want links like "Clients?org.apache.wicket:interface[...]"
+ // E.g. if we generate app/Clients we want links like "Clients?wicket:interface[...]"
prepender.prepend(relativeUrl.substring(relativeUrl.lastIndexOf("/") + 1));
}
// Fix for the special case where we're linking to the home page; make the link "./" not "".
Modified: incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/org/apache/wicket/protocol/http/request/urlcompressing/UrlCompressingWebCodingStrategy.java
URL: http://svn.apache.org/viewvc/incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/org/apache/wicket/protocol/http/request/urlcompressing/UrlCompressingWebCodingStrategy.java?view=diff&rev=527326&r1=527325&r2=527326
==============================================================================
--- incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/org/apache/wicket/protocol/http/request/urlcompressing/UrlCompressingWebCodingStrategy.java (original)
+++ incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/org/apache/wicket/protocol/http/request/urlcompressing/UrlCompressingWebCodingStrategy.java Tue Apr 10 15:36:37 2007
@@ -32,7 +32,7 @@
/**
* Use this CodingStategy with the
* {@link WebURLCompressingTargetResolverStrategy} to minimize the
- * org.apache.wicket:interface urls. The component path and the interface name will be
+ * wicket:interface urls. The component path and the interface name will be
* removed from the url and only an uid will be inserted into the url.
*
* Use it like this:
Modified: incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/org/apache/wicket/protocol/http/request/urlcompressing/UrlCompressingWebRequestProcessor.java
URL: http://svn.apache.org/viewvc/incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/org/apache/wicket/protocol/http/request/urlcompressing/UrlCompressingWebRequestProcessor.java?view=diff&rev=527326&r1=527325&r2=527326
==============================================================================
--- incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/org/apache/wicket/protocol/http/request/urlcompressing/UrlCompressingWebRequestProcessor.java (original)
+++ incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/org/apache/wicket/protocol/http/request/urlcompressing/UrlCompressingWebRequestProcessor.java Tue Apr 10 15:36:37 2007
@@ -35,7 +35,7 @@
import org.apache.wicket.util.string.Strings;
/**
- * Use this processor to minimize the org.apache.wicket:interface urls. The component path
+ * Use this processor to minimize the wicket:interface urls. The component path
* and the interface name will be removed from the url and only an uid will be
* inserted into the url.
*
Modified: incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/org/apache/wicket/protocol/http/servlet/AbortWithHttpStatusException.java
URL: http://svn.apache.org/viewvc/incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/org/apache/wicket/protocol/http/servlet/AbortWithHttpStatusException.java?view=diff&rev=527326&r1=527325&r2=527326
==============================================================================
--- incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/org/apache/wicket/protocol/http/servlet/AbortWithHttpStatusException.java (original)
+++ incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/org/apache/wicket/protocol/http/servlet/AbortWithHttpStatusException.java Tue Apr 10 15:36:37 2007
@@ -69,7 +69,7 @@
if (!(r instanceof WebResponse))
{
throw new IllegalStateException(
- "This exception can only be thrown when org.apache.wicket is processing an http request");
+ "This exception can only be thrown when wicket is processing an http request");
}
WebResponse wr = (WebResponse)r;
Modified: incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/org/apache/wicket/protocol/http/servlet/WicketSessionFilter.java
URL: http://svn.apache.org/viewvc/incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/org/apache/wicket/protocol/http/servlet/WicketSessionFilter.java?view=diff&rev=527326&r1=527325&r2=527326
==============================================================================
--- incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/org/apache/wicket/protocol/http/servlet/WicketSessionFilter.java (original)
+++ incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/org/apache/wicket/protocol/http/servlet/WicketSessionFilter.java Tue Apr 10 15:36:37 2007
@@ -138,7 +138,7 @@
log.debug("servlet path set to " + servletPath);
}
- sessionKey = "org.apache.wicket:" + servletPath + ":" + Session.SESSION_ATTRIBUTE_NAME;
+ sessionKey = "wicket:" + servletPath + ":" + Session.SESSION_ATTRIBUTE_NAME;
if (log.isDebugEnabled())
{
Modified: incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/org/apache/wicket/request/target/component/BookmarkableListenerInterfaceRequestTarget.java
URL: http://svn.apache.org/viewvc/incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/org/apache/wicket/request/target/component/BookmarkableListenerInterfaceRequestTarget.java?view=diff&rev=527326&r1=527325&r2=527326
==============================================================================
--- incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/org/apache/wicket/request/target/component/BookmarkableListenerInterfaceRequestTarget.java (original)
+++ incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/org/apache/wicket/request/target/component/BookmarkableListenerInterfaceRequestTarget.java Tue Apr 10 15:36:37 2007
@@ -79,7 +79,7 @@
int version = component.getPage().getCurrentVersionNumber();
- // add the org.apache.wicket:interface param to the params.
+ // add the wicket:interface param to the params.
AppendingStringBuffer param = new AppendingStringBuffer(4 + componentPath.length()
+ interfaceName.length());
if (pageMapName != null)
Modified: incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/org/apache/wicket/settings/Settings.java
URL: http://svn.apache.org/viewvc/incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/org/apache/wicket/settings/Settings.java?view=diff&rev=527326&r1=527325&r2=527326
==============================================================================
--- incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/org/apache/wicket/settings/Settings.java (original)
+++ incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/org/apache/wicket/settings/Settings.java Tue Apr 10 15:36:37 2007
@@ -228,7 +228,7 @@
private boolean stripComments = false;
/**
- * If true, org.apache.wicket tags ( <org.apache.wicket: ..>) and wicket:id attributes we be
+ * If true, org.apache.wicket tags ( <wicket: ..>) and wicket:id attributes we be
* removed from output
*/
private boolean stripWicketTags = false;
Modified: incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/org/apache/wicket/util/diff/DiffUtil.java
URL: http://svn.apache.org/viewvc/incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/org/apache/wicket/util/diff/DiffUtil.java?view=diff&rev=527326&r1=527325&r2=527326
==============================================================================
--- incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/org/apache/wicket/util/diff/DiffUtil.java (original)
+++ incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/org/apache/wicket/util/diff/DiffUtil.java Tue Apr 10 15:36:37 2007
@@ -92,7 +92,7 @@
// correct. It'll replace the current reference files. Thus change
// it only for one test-run.
// -Dwicket.replace.expected.results=true
- if (Boolean.getBoolean("org.apache.wicket.replace.expected.results"))
+ if (Boolean.getBoolean("wicket.replace.expected.results"))
{
in.close();
in = null;
Modified: incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/org/apache/wicket/util/parse/metapattern/parsers/VariableAssignmentParser.java
URL: http://svn.apache.org/viewvc/incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/org/apache/wicket/util/parse/metapattern/parsers/VariableAssignmentParser.java?view=diff&rev=527326&r1=527325&r2=527326
==============================================================================
--- incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/org/apache/wicket/util/parse/metapattern/parsers/VariableAssignmentParser.java (original)
+++ incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/org/apache/wicket/util/parse/metapattern/parsers/VariableAssignmentParser.java Tue Apr 10 15:36:37 2007
@@ -22,8 +22,8 @@
/**
* Parses key value assignment statements like "foo=bar" but also supporting
- * namespaces like "org.apache.wicket:foo=bar". However the 'key' value returned will
- * contain "org.apache.wicket:foo". It does not separate namespace and name.
+ * namespaces like "wicket:foo=bar". However the 'key' value returned will
+ * contain "wicket:foo". It does not separate namespace and name.
*
* @author Jonathan Locke
*/
Modified: incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/org/apache/wicket/util/string/Strings.java
URL: http://svn.apache.org/viewvc/incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/org/apache/wicket/util/string/Strings.java?view=diff&rev=527326&r1=527325&r2=527326
==============================================================================
--- incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/org/apache/wicket/util/string/Strings.java (original)
+++ incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/org/apache/wicket/util/string/Strings.java Tue Apr 10 15:36:37 2007
@@ -1188,8 +1188,9 @@
/**
* Outputs the throwable and its stacktrace to the stringbuffer. If
- * stopAtWicketSerlvet is true then the output will stop when the org.apache.wicket
- * servlet is reached. sun.reflect. packages are filtered out.
+ * stopAtWicketSerlvet is true then the output will stop when the
+ * org.apache.wicket servlet is reached. sun.reflect. packages are filtered
+ * out.
*
* @param cause
* @param sb
Modified: incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/test/java/org/apache/wicket/TestDetachPageAjaxResult.html
URL: http://svn.apache.org/viewvc/incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/test/java/org/apache/wicket/TestDetachPageAjaxResult.html?view=diff&rev=527326&r1=527325&r2=527326
==============================================================================
--- incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/test/java/org/apache/wicket/TestDetachPageAjaxResult.html (original)
+++ incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/test/java/org/apache/wicket/TestDetachPageAjaxResult.html Tue Apr 10 15:36:37 2007
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?><ajax-response><header-contribution encoding="wicket1" ><![CDATA[<head xmlns:wicket="http://wicket.sourceforge.net"><script type="text/javascript" src="resources/org.apache.wicket.markup.html.WicketEventReference/wicket-event.js"></script>
+<?xml version="1.0" encoding="UTF-8"?><ajax-response><header-contribution encoding="wicket1" ><![CDATA[<head xmlns:wicket="http://wicket.apache.org"><script type="text/javascript" src="resources/org.apache.wicket.markup.html.WicketEventReference/wicket-event.js"></script>
<script type="text/javascript" src="resources/org.apache.wicket.ajax.AbstractDefaultAjaxBehavior/wicket-ajax.js"></script>
<script type="text/javascript" id="wicket-ajax-debug-enable"><!--/*--><![CDATA[/*><!--*/
wicketAjaxDebugEnable=true;
Modified: incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/test/java/org/apache/wicket/ajax/MockComponent1-expected.html
URL: http://svn.apache.org/viewvc/incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/test/java/org/apache/wicket/ajax/MockComponent1-expected.html?view=diff&rev=527326&r1=527325&r2=527326
==============================================================================
--- incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/test/java/org/apache/wicket/ajax/MockComponent1-expected.html (original)
+++ incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/test/java/org/apache/wicket/ajax/MockComponent1-expected.html Tue Apr 10 15:36:37 2007
@@ -1,4 +1,4 @@
-<![CDATA[<head xmlns:wicket="http://wicket.sourceforge.net">
+<![CDATA[<head xmlns:wicket="http://wicket.apache.org">
<style type="text/css" id="org-apache-wicket-ajax-MockComponent1-0">
.onTheFlyClass {
background-color: red;
Modified: incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/test/java/org/apache/wicket/ajax/MockComponent3-expected.html
URL: http://svn.apache.org/viewvc/incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/test/java/org/apache/wicket/ajax/MockComponent3-expected.html?view=diff&rev=527326&r1=527325&r2=527326
==============================================================================
--- incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/test/java/org/apache/wicket/ajax/MockComponent3-expected.html (original)
+++ incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/test/java/org/apache/wicket/ajax/MockComponent3-expected.html Tue Apr 10 15:36:37 2007
@@ -1,3 +1,3 @@
-<![CDATA[<head xmlns:wicket="http://wicket.sourceforge.net">
+<![CDATA[<head xmlns:wicket="http://wicket.apache.org">
<link href="resources/org.apache.wicket.ajax.MockComponent3/mockStyleSheet3.css" rel="stylesheet" type="text/css" wicket:id="stylesheet"/>
</head>]]>
Modified: incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/test/java/org/apache/wicket/ajax/markup/html/componentMap/SimpleTestPageExpectedResult-1.html
URL: http://svn.apache.org/viewvc/incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/test/java/org/apache/wicket/ajax/markup/html/componentMap/SimpleTestPageExpectedResult-1.html?view=diff&rev=527326&r1=527325&r2=527326
==============================================================================
--- incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/test/java/org/apache/wicket/ajax/markup/html/componentMap/SimpleTestPageExpectedResult-1.html (original)
+++ incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/test/java/org/apache/wicket/ajax/markup/html/componentMap/SimpleTestPageExpectedResult-1.html Tue Apr 10 15:36:37 2007
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?><ajax-response><header-contribution encoding="wicket1" ><![CDATA[<head xmlns:wicket="http://wicket.sourceforge.net"><script type="text/javascript" src="resources/org.apache.wicket.markup.html.WicketEventReference/wicket-event.js"></script>
+<?xml version="1.0" encoding="UTF-8"?><ajax-response><header-contribution encoding="wicket1" ><![CDATA[<head xmlns:wicket="http://wicket.apache.org"><script type="text/javascript" src="resources/org.apache.wicket.markup.html.WicketEventReference/wicket-event.js"></script>
<script type="text/javascript" src="resources/org.apache.wicket.ajax.AbstractDefaultAjaxBehavior/wicket-ajax.js"></script>
<script type="text/javascript" id="wicket-ajax-debug-enable"><!--/*--><![CDATA[/*><!--*/
wicketAjaxDebugEnable=true;
Modified: incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/test/java/org/apache/wicket/markup/MarkupParserTest.java
URL: http://svn.apache.org/viewvc/incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/test/java/org/apache/wicket/markup/MarkupParserTest.java?view=diff&rev=527326&r1=527325&r2=527326
==============================================================================
--- incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/test/java/org/apache/wicket/markup/MarkupParserTest.java (original)
+++ incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/test/java/org/apache/wicket/markup/MarkupParserTest.java Tue Apr 10 15:36:37 2007
@@ -316,7 +316,7 @@
{
parser.parse("<wicket:remove> <wicket:remove> </wicket:remove> </wicket:remove>");
assertTrue(
- "Should have thrown an exception: remove regions must not contain org.apache.wicket-components",
+ "Should have thrown an exception: remove regions must not contain wicket-components",
false);
}
catch (MarkupException ex)
Modified: incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/test/java/org/apache/wicket/markup/WicketNamespaceExpectedResult_2.html
URL: http://svn.apache.org/viewvc/incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/test/java/org/apache/wicket/markup/WicketNamespaceExpectedResult_2.html?view=diff&rev=527326&r1=527325&r2=527326
==============================================================================
--- incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/test/java/org/apache/wicket/markup/WicketNamespaceExpectedResult_2.html (original)
+++ incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/test/java/org/apache/wicket/markup/WicketNamespaceExpectedResult_2.html Tue Apr 10 15:36:37 2007
@@ -12,7 +12,7 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<html xmlns:wicket="http://wicket.sourceforge.net/">
+<html xmlns:wicket="http://wicket.apache.org/">
<body>
<span wicket:id="label">my label test</span>
</body>
Modified: incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/test/java/org/apache/wicket/markup/WicketNamespaceExpectedResult_3.html
URL: http://svn.apache.org/viewvc/incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/test/java/org/apache/wicket/markup/WicketNamespaceExpectedResult_3.html?view=diff&rev=527326&r1=527325&r2=527326
==============================================================================
--- incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/test/java/org/apache/wicket/markup/WicketNamespaceExpectedResult_3.html (original)
+++ incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/test/java/org/apache/wicket/markup/WicketNamespaceExpectedResult_3.html Tue Apr 10 15:36:37 2007
@@ -12,7 +12,7 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<html xmlns:wcn="http://wicket.sourceforge.net/">
+<html xmlns:wcn="http://wicket.apache.org/">
<body>
<span wcn:id="label">my label test</span>
</body>
Modified: incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/test/java/org/apache/wicket/markup/WicketNamespaceExpectedResult_4.html
URL: http://svn.apache.org/viewvc/incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/test/java/org/apache/wicket/markup/WicketNamespaceExpectedResult_4.html?view=diff&rev=527326&r1=527325&r2=527326
==============================================================================
--- incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/test/java/org/apache/wicket/markup/WicketNamespaceExpectedResult_4.html (original)
+++ incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/test/java/org/apache/wicket/markup/WicketNamespaceExpectedResult_4.html Tue Apr 10 15:36:37 2007
@@ -12,7 +12,7 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<html xmlns:wcn="http://wicket.sourceforge.net/">
+<html xmlns:wcn="http://wicket.apache.org/">
<body>
<!-- not wicket namespace -->
<span wicket:id="label">xxx</span>
Modified: incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/test/java/org/apache/wicket/markup/WicketNamespace_2.html
URL: http://svn.apache.org/viewvc/incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/test/java/org/apache/wicket/markup/WicketNamespace_2.html?view=diff&rev=527326&r1=527325&r2=527326
==============================================================================
--- incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/test/java/org/apache/wicket/markup/WicketNamespace_2.html (original)
+++ incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/test/java/org/apache/wicket/markup/WicketNamespace_2.html Tue Apr 10 15:36:37 2007
@@ -12,7 +12,7 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<html xmlns:wicket="http://wicket.sourceforge.net/">
+<html xmlns:wicket="http://wicket.apache.org/">
<body>
<span wicket:id="label">xxx</span>
</body>
Modified: incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/test/java/org/apache/wicket/markup/WicketNamespace_3.html
URL: http://svn.apache.org/viewvc/incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/test/java/org/apache/wicket/markup/WicketNamespace_3.html?view=diff&rev=527326&r1=527325&r2=527326
==============================================================================
--- incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/test/java/org/apache/wicket/markup/WicketNamespace_3.html (original)
+++ incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/test/java/org/apache/wicket/markup/WicketNamespace_3.html Tue Apr 10 15:36:37 2007
@@ -12,7 +12,7 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<html xmlns:wcn="http://wicket.sourceforge.net/">
+<html xmlns:wcn="http://wicket.apache.org/">
<body>
<span wcn:id="label">xxx</span>
</body>
Modified: incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/test/java/org/apache/wicket/markup/WicketNamespace_4.html
URL: http://svn.apache.org/viewvc/incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/test/java/org/apache/wicket/markup/WicketNamespace_4.html?view=diff&rev=527326&r1=527325&r2=527326
==============================================================================
--- incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/test/java/org/apache/wicket/markup/WicketNamespace_4.html (original)
+++ incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/test/java/org/apache/wicket/markup/WicketNamespace_4.html Tue Apr 10 15:36:37 2007
@@ -12,7 +12,7 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<html xmlns:wcn="http://wicket.sourceforge.net/">
+<html xmlns:wcn="http://wicket.apache.org/">
<body>
<!-- not wicket namespace -->
<span wicket:id="label">xxx</span>
Modified: incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/test/java/org/apache/wicket/markup/html/ScopedPage.html
URL: http://svn.apache.org/viewvc/incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/test/java/org/apache/wicket/markup/html/ScopedPage.html?view=diff&rev=527326&r1=527325&r2=527326
==============================================================================
--- incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/test/java/org/apache/wicket/markup/html/ScopedPage.html (original)
+++ incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/test/java/org/apache/wicket/markup/html/ScopedPage.html Tue Apr 10 15:36:37 2007
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" xmlns:wicket="http://wicket.sourceforge.net/">
+<html xmlns="http://www.w3.org/1999/xhtml" xmlns:wicket="http://wicket.apache.org/">
<head>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
<title>Insert title here</title>
Modified: incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/test/java/org/apache/wicket/markup/html/ScopedPageExpectedResult.html
URL: http://svn.apache.org/viewvc/incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/test/java/org/apache/wicket/markup/html/ScopedPageExpectedResult.html?view=diff&rev=527326&r1=527325&r2=527326
==============================================================================
--- incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/test/java/org/apache/wicket/markup/html/ScopedPageExpectedResult.html (original)
+++ incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/test/java/org/apache/wicket/markup/html/ScopedPageExpectedResult.html Tue Apr 10 15:36:37 2007
@@ -1,6 +1,6 @@
<?xml version='1.0' encoding='UTF-8'?>
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" xmlns:wicket="http://wicket.sourceforge.net/">
+<html xmlns="http://www.w3.org/1999/xhtml" xmlns:wicket="http://wicket.apache.org/">
<head>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
<title>Insert title here</title>
Modified: incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/test/java/org/apache/wicket/markup/html/border/MyApplicationBorder.html
URL: http://svn.apache.org/viewvc/incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/test/java/org/apache/wicket/markup/html/border/MyApplicationBorder.html?view=diff&rev=527326&r1=527325&r2=527326
==============================================================================
--- incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/test/java/org/apache/wicket/markup/html/border/MyApplicationBorder.html (original)
+++ incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/test/java/org/apache/wicket/markup/html/border/MyApplicationBorder.html Tue Apr 10 15:36:37 2007
@@ -1,4 +1,4 @@
-<html xmlns:wicket="http://wicket.sourceforge.net/">
+<html xmlns:wicket="http://wicket.apache.org/">
<body>
<wicket:border>
<!-- A border within a bordered page -->
Modified: incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/test/java/org/apache/wicket/markup/html/debug/WicketComponentTreeTestPage_ExpectedResult.html
URL: http://svn.apache.org/viewvc/incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/test/java/org/apache/wicket/markup/html/debug/WicketComponentTreeTestPage_ExpectedResult.html?view=diff&rev=527326&r1=527325&r2=527326
==============================================================================
--- incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/test/java/org/apache/wicket/markup/html/debug/WicketComponentTreeTestPage_ExpectedResult.html (original)
+++ incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/test/java/org/apache/wicket/markup/html/debug/WicketComponentTreeTestPage_ExpectedResult.html Tue Apr 10 15:36:37 2007
@@ -19,7 +19,7 @@
<span wicket:id="componentList"><wicket:panel>
<h2>Page</h2>
<ul>
- <p><span wicket:id="info">[Page class = wicket.markup.html.debug.WicketComponentTreeTestPage, id = 0, version = 0]</span>:</p>
+ <p><span wicket:id="info">[Page class = org.apache.wicket.markup.html.debug.WicketComponentTreeTestPage, id = 0, version = 0]</span>:</p>
<table class="tablestyle">
<thead>
<tr>
@@ -34,20 +34,20 @@
<tr wicket:id="components">
<td valign="top" align="left"><span wicket:id="row">1</span> </td>
<td valign="top" align="left"><span wicket:id="path">_<body></span> </td>
- <td valign="top" align="left" nowrap><span wicket:id="size">425 bytes</span> </td>
- <td valign="top" align="left"><span wicket:id="type">wicket.markup.html.internal.HtmlBodyContainer</span> </td>
+ <td valign="top" align="left" nowrap><span wicket:id="size">502 bytes</span> </td>
+ <td valign="top" align="left"><span wicket:id="type">org.apache.wicket.markup.html.internal.HtmlBodyContainer</span> </td>
<td valign="top" align="left"><span wicket:id="model"></span> </td>
</tr><tr wicket:id="components">
<td valign="top" align="left"><span wicket:id="row">2</span> </td>
<td valign="top" align="left"><span wicket:id="path">label1</span> </td>
- <td valign="top" align="left" nowrap><span wicket:id="size">409 bytes</span> </td>
- <td valign="top" align="left"><span wicket:id="type">wicket.markup.html.basic.Label</span> </td>
+ <td valign="top" align="left" nowrap><span wicket:id="size">486 bytes</span> </td>
+ <td valign="top" align="left"><span wicket:id="type">org.apache.wicket.markup.html.basic.Label</span> </td>
<td valign="top" align="left"><span wicket:id="model">test1</span> </td>
</tr><tr wicket:id="components">
<td valign="top" align="left"><span wicket:id="row">3</span> </td>
<td valign="top" align="left"><span wicket:id="path">label2</span> </td>
- <td valign="top" align="left" nowrap><span wicket:id="size">410 bytes</span> </td>
- <td valign="top" align="left"><span wicket:id="type">wicket.markup.html.basic.Label</span> </td>
+ <td valign="top" align="left" nowrap><span wicket:id="size">487 bytes</span> </td>
+ <td valign="top" align="left"><span wicket:id="type">org.apache.wicket.markup.html.basic.Label</span> </td>
<td valign="top" align="left"><span wicket:id="model">test22</span> </td>
</tr>
</tbody>
Modified: incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/test/java/org/apache/wicket/markup/html/internal/ComponentResolvingPage.html
URL: http://svn.apache.org/viewvc/incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/test/java/org/apache/wicket/markup/html/internal/ComponentResolvingPage.html?view=diff&rev=527326&r1=527325&r2=527326
==============================================================================
--- incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/test/java/org/apache/wicket/markup/html/internal/ComponentResolvingPage.html (original)
+++ incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/test/java/org/apache/wicket/markup/html/internal/ComponentResolvingPage.html Tue Apr 10 15:36:37 2007
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" xmlns:wicket="http://wicket.sourceforge.net/">
+<html xmlns="http://www.w3.org/1999/xhtml" xmlns:wicket="http://wicket.apache.org/">
<head>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
<title>Insert title here</title>
Modified: incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/test/java/org/apache/wicket/markup/html/link/AutolinkPageExpectedResult_1.html
URL: http://svn.apache.org/viewvc/incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/test/java/org/apache/wicket/markup/html/link/AutolinkPageExpectedResult_1.html?view=diff&rev=527326&r1=527325&r2=527326
==============================================================================
--- incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/test/java/org/apache/wicket/markup/html/link/AutolinkPageExpectedResult_1.html (original)
+++ incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/test/java/org/apache/wicket/markup/html/link/AutolinkPageExpectedResult_1.html Tue Apr 10 15:36:37 2007
@@ -22,7 +22,7 @@
<!-- valid till the end of the document or the next link tag -->
<wicket:link autolink="false"/>
<a href="/WicketTester$DummyWebApplication/Page1.html">Home</a>
-<wicket:link autolink="true"/>
+<wicket:link autolink="true">
<a href="?wicket:bookmarkablePage=%3Aorg.apache.wicket.markup.html.link.subdir.Page1">Home</a>
<link href="resources/org.apache.wicket.markup.html.link.AutolinkPage_1/test_myStyle.css"/>
<link href="test2.css"/>
@@ -31,5 +31,6 @@
<a href="/root/test.html">Home</a>
<a href="?wicket:bookmarkablePage=%3Aorg.apache.wicket.markup.html.link.Page1">Home</a>
<a href="http://www.google.com">Google</a>
+</wicket:link>
</body>
</html>
Modified: incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/test/java/org/apache/wicket/markup/html/link/AutolinkPageExpectedResult_2.html
URL: http://svn.apache.org/viewvc/incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/test/java/org/apache/wicket/markup/html/link/AutolinkPageExpectedResult_2.html?view=diff&rev=527326&r1=527325&r2=527326
==============================================================================
--- incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/test/java/org/apache/wicket/markup/html/link/AutolinkPageExpectedResult_2.html (original)
+++ incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/test/java/org/apache/wicket/markup/html/link/AutolinkPageExpectedResult_2.html Tue Apr 10 15:36:37 2007
@@ -26,7 +26,7 @@
<a href="?wicket:bookmarkablePage=%3Aorg.apache.wicket.markup.html.link.subdir.Page1">Home</a>
<link href="resources/org.apache.wicket.markup.html.link.AutolinkPage_2/test_myStyle.css"/>
<a href="/root/test.html">Home</a>
-<a href="?wicket:bookmarkablePage=%3Aorg.apache.wicket.markup.html.link.Page1">Home</a>
+<a href="org/apache/wicket/markup/html/link/Page1.html">Home</a>
<a href="http://www.google.com">Google</a>
</body>
</html>
Modified: incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/test/java/org/apache/wicket/markup/html/link/AutolinkPage_1.html
URL: http://svn.apache.org/viewvc/incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/test/java/org/apache/wicket/markup/html/link/AutolinkPage_1.html?view=diff&rev=527326&r1=527325&r2=527326
==============================================================================
--- incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/test/java/org/apache/wicket/markup/html/link/AutolinkPage_1.html (original)
+++ incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/test/java/org/apache/wicket/markup/html/link/AutolinkPage_1.html Tue Apr 10 15:36:37 2007
@@ -20,16 +20,17 @@
</wicket:link>
</wicket:link>
<!-- valid till the end of the document or the next link tag -->
-<wicket:link autolink=false/>
+<wicket:link autolink="false"/>
<a href="Page1.html">Home</a>
-<wicket:link autolink=true/>
+<wicket:link autolink="true">
<a href="subdir/Page1.html">Home</a>
<link href="test.css"/>
<link href="test2.css"/>
<link href="test3.css"/>
<link href="../../html/link/test2.css"/>
<a href="/root/test.html">Home</a>
-<a href="org/apache/wicket/markup/html/link/Page1.html">Home</a>
+<a href="/org/apache/wicket/markup/html/link/Page1.html">Home</a>
<a href="http://www.google.com">Google</a>
+</wicket:link>
</body>
</html>
Modified: incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/test/java/org/apache/wicket/markup/html/link/AutolinkPage_2.html
URL: http://svn.apache.org/viewvc/incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/test/java/org/apache/wicket/markup/html/link/AutolinkPage_2.html?view=diff&rev=527326&r1=527325&r2=527326
==============================================================================
--- incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/test/java/org/apache/wicket/markup/html/link/AutolinkPage_2.html (original)
+++ incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/test/java/org/apache/wicket/markup/html/link/AutolinkPage_2.html Tue Apr 10 15:36:37 2007
@@ -1,4 +1,4 @@
-<html xmlns:wicket="http://wicket.sourceforge.net">
+<html xmlns:wicket="http://wicket.apache.org">
<head>
<title>Mock Page</title>
</head>
Modified: incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/test/java/org/apache/wicket/markup/html/link/Href_2.html
URL: http://svn.apache.org/viewvc/incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/test/java/org/apache/wicket/markup/html/link/Href_2.html?view=diff&rev=527326&r1=527325&r2=527326
==============================================================================
--- incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/test/java/org/apache/wicket/markup/html/link/Href_2.html (original)
+++ incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/test/java/org/apache/wicket/markup/html/link/Href_2.html Tue Apr 10 15:36:37 2007
@@ -12,7 +12,7 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<html xmlns:wcn="http://wicket.sourceforge.net">
+<html xmlns:wcn="http://wicket.apache.org">
<body>
<a wcn:id="link1" href="myHref.html"></a>
<a wcn:id="link2" href="myHref.html"/>
Modified: incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/test/java/org/apache/wicket/markup/html/tree/TreePage.html
URL: http://svn.apache.org/viewvc/incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/test/java/org/apache/wicket/markup/html/tree/TreePage.html?view=diff&rev=527326&r1=527325&r2=527326
==============================================================================
--- incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/test/java/org/apache/wicket/markup/html/tree/TreePage.html (original)
+++ incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/test/java/org/apache/wicket/markup/html/tree/TreePage.html Tue Apr 10 15:36:37 2007
@@ -1,4 +1,4 @@
-<html xmlns:wicket="http://wicket.sourceforge.net/">
+<html xmlns:wicket="http://wicket.apache.org/">
<body>
<span wicket:id="tree"/>
</body>
Modified: incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/test/java/org/apache/wicket/markup/html/tree/TreePageExpectedResult_1-1.html
URL: http://svn.apache.org/viewvc/incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/test/java/org/apache/wicket/markup/html/tree/TreePageExpectedResult_1-1.html?view=diff&rev=527326&r1=527325&r2=527326
==============================================================================
--- incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/test/java/org/apache/wicket/markup/html/tree/TreePageExpectedResult_1-1.html (original)
+++ incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/test/java/org/apache/wicket/markup/html/tree/TreePageExpectedResult_1-1.html Tue Apr 10 15:36:37 2007
@@ -1,4 +1,4 @@
-<html xmlns:wicket="http://wicket.sourceforge.net/">
+<html xmlns:wicket="http://wicket.apache.org/">
<head><link rel="stylesheet" type="text/css" href="resources/org.apache.wicket.markup.html.tree.Tree/tree.css" />
</head><body>
<span wicket:id="tree"><wicket:panel>
Modified: incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/test/java/org/apache/wicket/markup/html/tree/TreePageExpectedResult_1.html
URL: http://svn.apache.org/viewvc/incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/test/java/org/apache/wicket/markup/html/tree/TreePageExpectedResult_1.html?view=diff&rev=527326&r1=527325&r2=527326
==============================================================================
--- incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/test/java/org/apache/wicket/markup/html/tree/TreePageExpectedResult_1.html (original)
+++ incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/test/java/org/apache/wicket/markup/html/tree/TreePageExpectedResult_1.html Tue Apr 10 15:36:37 2007
@@ -1,4 +1,4 @@
-<html xmlns:wicket="http://wicket.sourceforge.net/">
+<html xmlns:wicket="http://wicket.apache.org/">
<head><link rel="stylesheet" type="text/css" href="resources/org.apache.wicket.markup.html.tree.Tree/tree.css" />
</head><body>
<span wicket:id="tree"><wicket:panel>
Modified: incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/test/java/org/apache/wicket/markup/html/tree/TreePageNoHtmlHead.html
URL: http://svn.apache.org/viewvc/incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/test/java/org/apache/wicket/markup/html/tree/TreePageNoHtmlHead.html?view=diff&rev=527326&r1=527325&r2=527326
==============================================================================
--- incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/test/java/org/apache/wicket/markup/html/tree/TreePageNoHtmlHead.html (original)
+++ incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/test/java/org/apache/wicket/markup/html/tree/TreePageNoHtmlHead.html Tue Apr 10 15:36:37 2007
@@ -1,4 +1,4 @@
-<html xmlns:wicket="http://wicket.sourceforge.net/">
+<html xmlns:wicket="http://wicket.apache.org/">
<body>
<span wicket:id="tree"/>
</body>
Modified: incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/test/java/org/apache/wicket/markup/html/tree/TreePageNoHtmlHeadExpectedResult_1-1.html
URL: http://svn.apache.org/viewvc/incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/test/java/org/apache/wicket/markup/html/tree/TreePageNoHtmlHeadExpectedResult_1-1.html?view=diff&rev=527326&r1=527325&r2=527326
==============================================================================
--- incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/test/java/org/apache/wicket/markup/html/tree/TreePageNoHtmlHeadExpectedResult_1-1.html (original)
+++ incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/test/java/org/apache/wicket/markup/html/tree/TreePageNoHtmlHeadExpectedResult_1-1.html Tue Apr 10 15:36:37 2007
@@ -1,4 +1,4 @@
-<html xmlns:wicket="http://wicket.sourceforge.net/">
+<html xmlns:wicket="http://wicket.apache.org/">
<head>
<wicket:head>
<link href="/MockWebApplication/MockWebApplication/resources/org.apache.wicket.markup.html.tree.Tree/tree.css" type="text/css" rel="StyleSheet" wicket:id="css"/>
Modified: incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/test/java/org/apache/wicket/markup/html/tree/TreePageNoHtmlHeadExpectedResult_1.html
URL: http://svn.apache.org/viewvc/incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/test/java/org/apache/wicket/markup/html/tree/TreePageNoHtmlHeadExpectedResult_1.html?view=diff&rev=527326&r1=527325&r2=527326
==============================================================================
--- incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/test/java/org/apache/wicket/markup/html/tree/TreePageNoHtmlHeadExpectedResult_1.html (original)
+++ incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/test/java/org/apache/wicket/markup/html/tree/TreePageNoHtmlHeadExpectedResult_1.html Tue Apr 10 15:36:37 2007
@@ -1,4 +1,4 @@
-<html xmlns:wicket="http://wicket.sourceforge.net/">
+<html xmlns:wicket="http://wicket.apache.org/">
<head>
<wicket:head>
<link href="/MockWebApplication/MockWebApplication/resources/org.apache.wicket.markup.html.tree.Tree/tree.css" type="text/css" rel="StyleSheet" wicket:id="css"/>