Author: ivaynberg
Date: Sun Oct 11 01:06:09 2009
New Revision: 823996
URL: http://svn.apache.org/viewvc?rev=823996&view=rev
Log:
removing the last ng util package
Removed:
wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/util/lang/
Modified:
wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/page/persistent/DefaultPageStore.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/request/Url.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/request/component/PageParameters.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/request/parameter/UrlRequestParametersAdapter.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/resource/ResourceReference.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/resource/ResourceReferenceRegistry.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/util/lang/Objects.java
Modified:
wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/page/persistent/DefaultPageStore.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/page/persistent/DefaultPageStore.java?rev=823996&r1=823995&r2=823996&view=diff
==============================================================================
---
wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/page/persistent/DefaultPageStore.java
(original)
+++
wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/page/persistent/DefaultPageStore.java
Sun Oct 11 01:06:09 2009
@@ -8,8 +8,8 @@
import org.apache.wicket.ng.Page;
import org.apache.wicket.ng.page.ManageablePage;
-import org.apache.wicket.ng.util.lang.Objects;
import org.apache.wicket.util.lang.Checks;
+import org.apache.wicket.util.lang.Objects;
public class DefaultPageStore implements PageStore
{
Modified:
wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/request/Url.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/request/Url.java?rev=823996&r1=823995&r2=823996&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/request/Url.java
(original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/request/Url.java Sun
Oct 11 01:06:09 2009
@@ -23,8 +23,8 @@
import org.apache.wicket.ng.protocol.http.WicketURLDecoder;
import org.apache.wicket.ng.protocol.http.WicketURLEncoder;
-import org.apache.wicket.ng.util.lang.Objects;
import org.apache.wicket.util.lang.Checks;
+import org.apache.wicket.util.lang.Objects;
import org.apache.wicket.util.string.StringValue;
import org.apache.wicket.util.string.Strings;
Modified:
wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/request/component/PageParameters.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/request/component/PageParameters.java?rev=823996&r1=823995&r2=823996&view=diff
==============================================================================
---
wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/request/component/PageParameters.java
(original)
+++
wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/request/component/PageParameters.java
Sun Oct 11 01:06:09 2009
@@ -9,8 +9,8 @@
import java.util.TreeSet;
import org.apache.wicket.ng.request.RequestMapper;
-import org.apache.wicket.ng.util.lang.Objects;
import org.apache.wicket.util.lang.Checks;
+import org.apache.wicket.util.lang.Objects;
import org.apache.wicket.util.string.StringValue;
/**
Modified:
wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/request/parameter/UrlRequestParametersAdapter.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/request/parameter/UrlRequestParametersAdapter.java?rev=823996&r1=823995&r2=823996&view=diff
==============================================================================
---
wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/request/parameter/UrlRequestParametersAdapter.java
(original)
+++
wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/request/parameter/UrlRequestParametersAdapter.java
Sun Oct 11 01:06:09 2009
@@ -25,8 +25,8 @@
import org.apache.wicket.ng.request.RequestParameters;
import org.apache.wicket.ng.request.Url;
import org.apache.wicket.ng.request.Url.QueryParameter;
-import org.apache.wicket.ng.util.lang.Objects;
import org.apache.wicket.util.lang.Checks;
+import org.apache.wicket.util.lang.Objects;
import org.apache.wicket.util.string.StringValue;
/**
@@ -40,15 +40,16 @@
/**
* Construct.
+ *
* @param url
*/
public UrlRequestParametersAdapter(Url url)
{
Checks.argumentNotNull(url, "url");
-
+
this.url = url;
}
-
+
public Set<String> getParameterNames()
{
Set<String> result = new HashSet<String>();
Modified:
wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/resource/ResourceReference.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/resource/ResourceReference.java?rev=823996&r1=823995&r2=823996&view=diff
==============================================================================
---
wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/resource/ResourceReference.java
(original)
+++
wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/resource/ResourceReference.java
Sun Oct 11 01:06:09 2009
@@ -19,9 +19,9 @@
import java.io.Serializable;
import java.util.Locale;
-import org.apache.wicket.ng.util.lang.Objects;
import org.apache.wicket.util.lang.Checks;
import org.apache.wicket.util.lang.Classes;
+import org.apache.wicket.util.lang.Objects;
/**
* Reference to a resource. Can be used to reference global resources.
@@ -35,7 +35,7 @@
private final String scope;
private final String name;
private final Locale locale;
- private String style;
+ private final String style;
/**
* Creates new {...@link ResourceReference} instance.
@@ -52,7 +52,7 @@
Checks.argumentNotNull(scope, "scope");
Checks.argumentNotNull(name, "name");
- this.scope = scope.getName();
+ this.scope = scope.getName();
this.name = name;
this.locale = locale;
this.style = style;
@@ -113,7 +113,7 @@
{
return Objects.hashCode(scope, name, locale, style);
}
-
+
/**
* Creates new resource.
*
Modified:
wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/resource/ResourceReferenceRegistry.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/resource/ResourceReferenceRegistry.java?rev=823996&r1=823995&r2=823996&view=diff
==============================================================================
---
wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/resource/ResourceReferenceRegistry.java
(original)
+++
wicket/trunk/wicket/src/main/java/org/apache/wicket/ng/resource/ResourceReferenceRegistry.java
Sun Oct 11 01:06:09 2009
@@ -20,8 +20,8 @@
import java.util.Map;
import java.util.concurrent.ConcurrentHashMap;
-import org.apache.wicket.ng.util.lang.Objects;
import org.apache.wicket.util.lang.Checks;
+import org.apache.wicket.util.lang.Objects;
/**
* Allows to register and lookup {...@link ResourceReference}s.
Modified:
wicket/trunk/wicket/src/main/java/org/apache/wicket/util/lang/Objects.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/util/lang/Objects.java?rev=823996&r1=823995&r2=823996&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/util/lang/Objects.java
(original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/util/lang/Objects.java
Sun Oct 11 01:06:09 2009
@@ -1092,6 +1092,48 @@
*
* @param object
* The object
+ *
+ * @param applicationName
+ * The name of application - required when serialization and
deserialisation happen
+ * outside thread in which application thread local is set
+ *
+ * @return The serialized object
+ */
+ public static byte[] objectToByteArray(final Object object, String
applicationName)
+ {
+ try
+ {
+ final ByteArrayOutputStream out = new
ByteArrayOutputStream();
+ ObjectOutputStream oos = null;
+ try
+ {
+ oos =
objectStreamFactory.newObjectOutputStream(out);
+ oos.writeObject(applicationName);
+ oos.writeObject(object);
+ }
+ finally
+ {
+ if (oos != null)
+ {
+ oos.close();
+ }
+ out.close();
+ }
+ return out.toByteArray();
+ }
+ catch (Exception e)
+ {
+ log.error("Error serializing object " +
object.getClass() + " [object=" + object + "]",
+ e);
+ }
+ return null;
+ }
+
+ /**
+ * Serializes an object into a byte array.
+ *
+ * @param object
+ * The object
* @return The serialized object
*/
public static byte[] objectToByteArray(final Object object)
