From 42966592d47e6ba31c2d117e68aba6e280945032 Mon Sep 17 00:00:00 2001 From: Maxim Solodovnik Date: Fri, 20 Apr 2018 15:31:12 +0700 Subject: [PATCH] Module for 'Kryo 1' is removed, Kryo2 is updated to latest version --- pom.xml | 13 -- serializer-kryo/README.md | 30 --- serializer-kryo/pom.xml | 34 ---- .../pageserializer/kryo/DebuggingKryo.java | 65 ------ .../pageserializer/kryo/KryoSerializer.java | 189 ------------------ .../kryo/WicketChildListSerializer.java | 61 ------ .../pageserializer/kryo/HomePage.java | 31 --- .../kryo/KryoSerializerTest.java | 55 ----- .../pageserializer/kryo/Start.java | 58 ------ .../kryo/WicketApplication.java | 37 ---- .../src/test/resources/log4j.properties | 8 - .../pageserializer/kryo/HomePage.html | 26 --- .../src/test/webapp/WEB-INF/web.xml | 32 --- serializer-kryo/src/test/webapp/logo.png | Bin 12244 -> 0 bytes serializer-kryo/src/test/webapp/style.css | 68 ------- serializer-kryo2/pom.xml | 68 +++---- .../kryo2/KryoSerializerTest.java | 2 +- 17 files changed, 32 insertions(+), 745 deletions(-) delete mode 100644 serializer-kryo/README.md delete mode 100644 serializer-kryo/pom.xml delete mode 100644 serializer-kryo/src/main/java/org/wicketstuff/pageserializer/kryo/DebuggingKryo.java delete mode 100644 serializer-kryo/src/main/java/org/wicketstuff/pageserializer/kryo/KryoSerializer.java delete mode 100644 serializer-kryo/src/main/java/org/wicketstuff/pageserializer/kryo/WicketChildListSerializer.java delete mode 100644 serializer-kryo/src/test/java/org/wicketstuff/pageserializer/kryo/HomePage.java delete mode 100644 serializer-kryo/src/test/java/org/wicketstuff/pageserializer/kryo/KryoSerializerTest.java delete mode 100644 serializer-kryo/src/test/java/org/wicketstuff/pageserializer/kryo/Start.java delete mode 100644 serializer-kryo/src/test/java/org/wicketstuff/pageserializer/kryo/WicketApplication.java delete mode 100644 serializer-kryo/src/test/resources/log4j.properties delete mode 100644 serializer-kryo/src/test/resources/org/wicketstuff/pageserializer/kryo/HomePage.html delete mode 100644 serializer-kryo/src/test/webapp/WEB-INF/web.xml delete mode 100644 serializer-kryo/src/test/webapp/logo.png delete mode 100644 serializer-kryo/src/test/webapp/style.css diff --git a/pom.xml b/pom.xml index d86a45a401..19f23810e3 100644 --- a/pom.xml +++ b/pom.xml @@ -296,7 +296,6 @@ closure-compiler scala-extensions-parent serializer-common - serializer-kryo serializer-kryo2 serializer-fast2 serializer-ui @@ -631,18 +630,6 @@ ${sf-jung.version} - - - com.googlecode - kryo - 1.04 - - - de.javakaffee - kryo-serializers - 0.9 - - com.googlecode.htmlcompressor diff --git a/serializer-kryo/README.md b/serializer-kryo/README.md deleted file mode 100644 index 144d565777..0000000000 --- a/serializer-kryo/README.md +++ /dev/null @@ -1,30 +0,0 @@ -Serializer Kryo -=============== -is an implementation of `org.apache.wicket.serialize.ISerializer` for Wicket 1.5 - -Such serializer can be used to convert almost any kind of object to/from byte array. Almost any because Kryo may need your help for some complex graph of objects. Refer to Kryo documentation to understand more about that. - -When configured with - - - public class MyApplication extends WebApplication - { - @Override - public void init() - { - super.init(); - - getFrameworkSettings().setSerializer(new KryoSerializer()); - } - } - - -it will be used to serialize any page for the IPageStore needs. - -It is based on [Kryo](http://code.google.com/p/kryo/) and [kryo-serializers](https://github.com/magro/kryo-serializers). - -Notes ----- -* serializer-kryo is not heavily tested so it may have need for more custom serializers for some of the Wicket classes. Let us know if you face a problem by creating an issue. Pull requests are more than welcome! - -* serializer-kryo uses SUN/Oracle propriate APIs (sun.reflect.ReflectionFactory) and thus cannot be used on different JDKs. diff --git a/serializer-kryo/pom.xml b/serializer-kryo/pom.xml deleted file mode 100644 index 4d0c820a29..0000000000 --- a/serializer-kryo/pom.xml +++ /dev/null @@ -1,34 +0,0 @@ - - 4.0.0 - - - org.wicketstuff - wicketstuff-core - 8.0.0-SNAPSHOT - - - wicketstuff-serializer-kryo - - WicketStuff Kryo serializer - ISerializer based on http://code.google.com/p/kryo/ - - - - junit - junit - - - com.googlecode - kryo - - - de.javakaffee - kryo-serializers - - - org.eclipse.jetty.aggregate - jetty-all - uber - - - diff --git a/serializer-kryo/src/main/java/org/wicketstuff/pageserializer/kryo/DebuggingKryo.java b/serializer-kryo/src/main/java/org/wicketstuff/pageserializer/kryo/DebuggingKryo.java deleted file mode 100644 index 57b853a630..0000000000 --- a/serializer-kryo/src/main/java/org/wicketstuff/pageserializer/kryo/DebuggingKryo.java +++ /dev/null @@ -1,65 +0,0 @@ -package org.wicketstuff.pageserializer.kryo; - -import java.nio.ByteBuffer; -import java.util.ArrayList; -import java.util.List; - -import org.apache.wicket.util.lang.Args; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -import de.javakaffee.kryoserializers.KryoReflectionFactorySupport; - -/** - * An extension of {@link KryoReflectionFactorySupport} that logs the serialized objects and the - * current size of the buffer after the write. Additionally provides the functionality to blacklist - * the serialization of specific classes. - */ -public class DebuggingKryo extends KryoReflectionFactorySupport -{ - - private final static Logger LOG = LoggerFactory.getLogger(DebuggingKryo.class); - - private final List> blackList; - - public DebuggingKryo() - { - blackList = new ArrayList>(); - } - - public DebuggingKryo blacklist(final Class... classes) - { - Args.notNull(classes, "classes"); - - for (Class cls : classes) - { - blackList.add(cls); - } - return this; - } - - @Override - public void writeClassAndObject(ByteBuffer buffer, Object object) - { - - if (object != null) - { - Class target = object.getClass(); - for (Class cls : blackList) - { - if (cls.isAssignableFrom(target)) - { - throw new IllegalArgumentException("Should not serialize class with type: " + - cls.getName()); - } - } - } - super.writeClassAndObject(buffer, object); - - if (object != null) - { - LOG.error("Wrote '{}' bytes for object: '{}'", buffer.position(), object.getClass()); - } - } - -} diff --git a/serializer-kryo/src/main/java/org/wicketstuff/pageserializer/kryo/KryoSerializer.java b/serializer-kryo/src/main/java/org/wicketstuff/pageserializer/kryo/KryoSerializer.java deleted file mode 100644 index f08cdf1155..0000000000 --- a/serializer-kryo/src/main/java/org/wicketstuff/pageserializer/kryo/KryoSerializer.java +++ /dev/null @@ -1,189 +0,0 @@ -package org.wicketstuff.pageserializer.kryo; - -import java.lang.reflect.InvocationHandler; -import java.nio.ByteBuffer; -import java.util.Arrays; -import java.util.Collections; -import java.util.Currency; -import java.util.GregorianCalendar; - -import org.apache.wicket.markup.html.WebMarkupContainer; -import org.apache.wicket.markup.html.WebPage; -import org.apache.wicket.markup.html.basic.Label; -import org.apache.wicket.markup.html.link.Link; -import org.apache.wicket.markup.html.list.ListView; -import org.apache.wicket.markup.html.panel.Panel; -import org.apache.wicket.serialize.ISerializer; -import org.apache.wicket.util.lang.Args; -import org.apache.wicket.util.lang.Bytes; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -import com.esotericsoftware.kryo.Kryo; -import com.esotericsoftware.kryo.Serializer; - -import de.javakaffee.kryoserializers.ArraysAsListSerializer; -import de.javakaffee.kryoserializers.ClassSerializer; -import de.javakaffee.kryoserializers.CollectionsEmptyListSerializer; -import de.javakaffee.kryoserializers.CollectionsEmptyMapSerializer; -import de.javakaffee.kryoserializers.CollectionsEmptySetSerializer; -import de.javakaffee.kryoserializers.CollectionsSingletonListSerializer; -import de.javakaffee.kryoserializers.CollectionsSingletonMapSerializer; -import de.javakaffee.kryoserializers.CollectionsSingletonSetSerializer; -import de.javakaffee.kryoserializers.CurrencySerializer; -import de.javakaffee.kryoserializers.GregorianCalendarSerializer; -import de.javakaffee.kryoserializers.JdkProxySerializer; -import de.javakaffee.kryoserializers.KryoReflectionFactorySupport; -import de.javakaffee.kryoserializers.StringBufferSerializer; -import de.javakaffee.kryoserializers.StringBuilderSerializer; -import de.javakaffee.kryoserializers.SynchronizedCollectionsSerializer; -import de.javakaffee.kryoserializers.UnmodifiableCollectionsSerializer; -import de.javakaffee.kryoserializers.cglib.CGLibProxySerializer; - -/** - * An {@link ISerializer} based on kryo and additional kryo serializers - */ -public class KryoSerializer implements ISerializer -{ - - private static final Logger LOG = LoggerFactory.getLogger(KryoSerializer.class); - - /** - * The size of the {@link ByteBuffer} that is used to hold the serialized page - */ - private static final Bytes DEFAULT_BUFFER_SIZE = Bytes.megabytes(10L); - - private final Bytes bufferSize; - - private final Kryo kryo; - - public KryoSerializer() - { - this(DEFAULT_BUFFER_SIZE); - } - - public KryoSerializer(final Bytes bufferSize) - { - - this.bufferSize = Args.notNull(bufferSize, "bufferSize"); - LOG.debug("Buffer size: '{}'", bufferSize); - - kryo = createKryo(); - - internalInit(kryo); - } - - protected Kryo createKryo() - { - return new KryoReflectionFactorySupport(); - } - - @Override - public byte[] serialize(final Object object) - { - LOG.debug("Going to serialize: '{}'", object); - ByteBuffer buffer = getBuffer(object); - kryo.writeClassAndObject(buffer, object); - byte[] data; - if (buffer.hasArray()) - { - data = new byte[buffer.position()]; - buffer.flip(); - buffer.get(data); - } - else - { - LOG.error("Kryo wasn't able to serialize: '{}'", object); - data = null; - } - - // release the memory for the buffer - buffer.clear(); - buffer = null; - System.runFinalization(); - - return data; - } - - @Override - public Object deserialize(byte[] data) - { - ByteBuffer buffer = ByteBuffer.wrap(data); - Object object = kryo.readClassAndObject(buffer); - LOG.debug("Deserialized: '{}'", object); - - // release the memory for the buffer - buffer.clear(); - buffer = null; - System.runFinalization(); - - return object; - } - - /** - * Creates the buffer that will be used to serialize the {@code target} - * - * @param target - * the object that will be serialized. Can be used to decide dynamically what size to - * use - * @return the buffer that will be used to serialize the {@code target} - */ - protected ByteBuffer getBuffer(Object target) - { - return ByteBuffer.allocate((int)bufferSize.bytes()); - } - - /** - * Configures {@link Kryo} with some custom {@link Serializer}s and registers some known Wicket - * classes which are known to be serialized sooner or later - * - * @param kryo - * the {@link Kryo} instance to configured - */ - private void internalInit(final Kryo kryo) - { - - kryo.register(Arrays.asList("").getClass(), new ArraysAsListSerializer(kryo)); - kryo.register(Class.class, new ClassSerializer(kryo)); - kryo.register(Collections.EMPTY_LIST.getClass(), new CollectionsEmptyListSerializer()); - kryo.register(Collections.EMPTY_MAP.getClass(), new CollectionsEmptyMapSerializer()); - kryo.register(Collections.EMPTY_SET.getClass(), new CollectionsEmptySetSerializer()); - kryo.register(Collections.singletonList("").getClass(), - new CollectionsSingletonListSerializer(kryo)); - kryo.register(Collections.singleton("").getClass(), new CollectionsSingletonSetSerializer( - kryo)); - kryo.register(Collections.singletonMap("", "").getClass(), - new CollectionsSingletonMapSerializer(kryo)); - kryo.register(Currency.class, new CurrencySerializer(kryo)); - kryo.register(GregorianCalendar.class, new GregorianCalendarSerializer()); - kryo.register(InvocationHandler.class, new JdkProxySerializer(kryo)); - kryo.register(StringBuffer.class, new StringBufferSerializer(kryo)); - kryo.register(StringBuilder.class, new StringBuilderSerializer(kryo)); - UnmodifiableCollectionsSerializer.registerSerializers(kryo); - SynchronizedCollectionsSerializer.registerSerializers(kryo); - kryo.register(CGLibProxySerializer.CGLibProxyMarker.class, new CGLibProxySerializer(kryo)); - kryo.register(InvocationHandler.class, new JdkProxySerializer(kryo)); - - kryo.setRegistrationOptional(true); - kryo.register(Panel.class); - kryo.register(WebPage.class); - kryo.register(WebMarkupContainer.class); - kryo.register(Link.class); - kryo.register(Label.class); - kryo.register(ListView.class); - - init(kryo); - } - - /** - * A method which can be overridden by users to do more configuration - * - * @param kryo - * the {@link Kryo} instance to configure - */ - protected void init(final Kryo kryo) - { - - } -} \ No newline at end of file diff --git a/serializer-kryo/src/main/java/org/wicketstuff/pageserializer/kryo/WicketChildListSerializer.java b/serializer-kryo/src/main/java/org/wicketstuff/pageserializer/kryo/WicketChildListSerializer.java deleted file mode 100644 index e79f6b1fea..0000000000 --- a/serializer-kryo/src/main/java/org/wicketstuff/pageserializer/kryo/WicketChildListSerializer.java +++ /dev/null @@ -1,61 +0,0 @@ -/* - * Copyright 2010 Martin Grotzke - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - */ -package org.wicketstuff.pageserializer.kryo; - -import org.apache.wicket.MarkupContainer; -import org.apache.wicket.serialize.ISerializer; - -import com.esotericsoftware.kryo.Kryo; -import com.esotericsoftware.kryo.serialize.FieldSerializer; - -/** - * A reworked WicketChildListSerializerFactory from memcached-session-manager project - * - * @author Martin Grotzke - */ -public class WicketChildListSerializer extends FieldSerializer -{ - - - private static final String SERIALIZED_CLASS_NAME = MarkupContainer.class.getName() + - "$ChildList"; - public static Class CLASS = null; - static - { - try - { - CLASS = Class.forName(SERIALIZED_CLASS_NAME, false, ISerializer.class.getClassLoader()); - } - catch (ClassNotFoundException e) - { - e.printStackTrace(); - } - } - - /** - * Creates a new instances. - * - * @param kryo - * the kryo instance that must be provided. - */ - public WicketChildListSerializer(final Kryo kryo) - { - super(kryo, CLASS); - } - -} \ No newline at end of file diff --git a/serializer-kryo/src/test/java/org/wicketstuff/pageserializer/kryo/HomePage.java b/serializer-kryo/src/test/java/org/wicketstuff/pageserializer/kryo/HomePage.java deleted file mode 100644 index 2356e62bc3..0000000000 --- a/serializer-kryo/src/test/java/org/wicketstuff/pageserializer/kryo/HomePage.java +++ /dev/null @@ -1,31 +0,0 @@ -package org.wicketstuff.pageserializer.kryo; - -import org.apache.wicket.ajax.AjaxRequestTarget; -import org.apache.wicket.ajax.markup.html.AjaxLink; -import org.apache.wicket.markup.html.WebPage; -import org.apache.wicket.markup.html.basic.Label; -import org.apache.wicket.request.mapper.parameter.PageParameters; - -public class HomePage extends WebPage -{ - private static final long serialVersionUID = 1L; - - public HomePage(final PageParameters parameters) - { - super(parameters); - - add(new Label("label", "Kryo Rocks!")); - - add(new AjaxLink("link") - { - private static final long serialVersionUID = 1L; - - @Override - public void onClick(AjaxRequestTarget target) - { - System.err.println("click"); - } - }); - - } -} diff --git a/serializer-kryo/src/test/java/org/wicketstuff/pageserializer/kryo/KryoSerializerTest.java b/serializer-kryo/src/test/java/org/wicketstuff/pageserializer/kryo/KryoSerializerTest.java deleted file mode 100644 index 34f60eb507..0000000000 --- a/serializer-kryo/src/test/java/org/wicketstuff/pageserializer/kryo/KryoSerializerTest.java +++ /dev/null @@ -1,55 +0,0 @@ -package org.wicketstuff.pageserializer.kryo; - -import org.apache.wicket.serialize.ISerializer; -import org.apache.wicket.util.tester.WicketTester; -import org.junit.After; -import org.junit.Assert; -import org.junit.Before; -import org.junit.Test; - -/** - * Simple test using the WicketTester - */ -public class KryoSerializerTest -{ - private WicketTester tester; - - @Before - public void setUp() - { - tester = new WicketTester(new WicketApplication()); - } - - @After - public void tearDown() - { - tester.destroy(); - } - - @Test - public void homepageRendersSuccessfully() - { - // start and render the test page - HomePage page = tester.startPage(HomePage.class); - - // assert rendered page class - tester.assertRenderedPage(HomePage.class); - - ISerializer pageSerializer = tester.getApplication().getFrameworkSettings().getSerializer(); - Assert.assertTrue( - "The configured IObjectSerializer is not instance of KryoSerializer! Type: " + - pageSerializer.getClass(), pageSerializer instanceof KryoSerializer); - - byte[] data = pageSerializer.serialize(page); - Assert.assertNotNull("The produced data should not be null!", data); - - // data length can fluctuate based on the object field values - Assert.assertTrue("The produced data length is not correct!", data.length > 300); - - Object object = pageSerializer.deserialize(data); - Assert.assertTrue( - "The deserialized page must be of type HomePage. Type: " + object.getClass(), - object instanceof HomePage); - - } -} diff --git a/serializer-kryo/src/test/java/org/wicketstuff/pageserializer/kryo/Start.java b/serializer-kryo/src/test/java/org/wicketstuff/pageserializer/kryo/Start.java deleted file mode 100644 index a473457696..0000000000 --- a/serializer-kryo/src/test/java/org/wicketstuff/pageserializer/kryo/Start.java +++ /dev/null @@ -1,58 +0,0 @@ -package org.wicketstuff.pageserializer.kryo; - -import org.eclipse.jetty.server.HttpConfiguration; -import org.eclipse.jetty.server.HttpConnectionFactory; -import org.eclipse.jetty.server.Server; -import org.eclipse.jetty.server.ServerConnector; -import org.eclipse.jetty.webapp.WebAppContext; - -public class Start -{ - - public static void main(String[] args) throws Exception - { - Server server = new Server(); - - HttpConfiguration http_config = new HttpConfiguration(); - http_config.setSecureScheme("https"); - http_config.setSecurePort(8443); - http_config.setOutputBufferSize(32768); - - ServerConnector http = new ServerConnector(server, new HttpConnectionFactory(http_config)); - http.setPort(8080); - http.setIdleTimeout(1000 * 60 * 60); - - server.addConnector(http); - - WebAppContext bb = new WebAppContext(); - bb.setServer(server); - bb.setContextPath("/"); - bb.setWar("src/main/webapp"); - - // START JMX SERVER - // MBeanServer mBeanServer = ManagementFactory.getPlatformMBeanServer(); - // MBeanContainer mBeanContainer = new MBeanContainer(mBeanServer); - // server.getContainer().addEventListener(mBeanContainer); - // mBeanContainer.start(); - - server.setHandler(bb); - - try - { - System.out.println(">>> STARTING EMBEDDED JETTY SERVER, PRESS ANY KEY TO STOP"); - server.start(); - System.in.read(); - System.out.println(">>> STOPPING EMBEDDED JETTY SERVER"); - // while (System.in.available() == 0) { - // Thread.sleep(5000); - // } - server.stop(); - server.join(); - } - catch (Exception e) - { - e.printStackTrace(); - System.exit(100); - } - } -} diff --git a/serializer-kryo/src/test/java/org/wicketstuff/pageserializer/kryo/WicketApplication.java b/serializer-kryo/src/test/java/org/wicketstuff/pageserializer/kryo/WicketApplication.java deleted file mode 100644 index 01711f6849..0000000000 --- a/serializer-kryo/src/test/java/org/wicketstuff/pageserializer/kryo/WicketApplication.java +++ /dev/null @@ -1,37 +0,0 @@ -package org.wicketstuff.pageserializer.kryo; - -import org.apache.wicket.protocol.http.WebApplication; -import org.apache.wicket.util.lang.Bytes; - -import com.esotericsoftware.kryo.Kryo; - -/** - * Application object for your web application. If you want to run this application without - * deploying, run the Start class. - * - * @see org.wicketstuff.pageserializer.kryo.mycompany.Start#main(String[]) - */ -public class WicketApplication extends WebApplication -{ - @Override - public Class getHomePage() - { - return HomePage.class; - } - - @Override - public void init() - { - super.init(); - - getFrameworkSettings().setSerializer(new KryoSerializer(Bytes.bytes(1000)) - { - - @Override - protected Kryo createKryo() - { - return new DebuggingKryo()/* .blacklist(Some.class) */; - } - }); - } -} diff --git a/serializer-kryo/src/test/resources/log4j.properties b/serializer-kryo/src/test/resources/log4j.properties deleted file mode 100644 index 31666f9f8d..0000000000 --- a/serializer-kryo/src/test/resources/log4j.properties +++ /dev/null @@ -1,8 +0,0 @@ -log4j.appender.Stdout=org.apache.log4j.ConsoleAppender -log4j.appender.Stdout.layout=org.apache.log4j.PatternLayout -log4j.appender.Stdout.layout.conversionPattern=%-5p - %-26.26c{1} - %m\n - -log4j.rootLogger=WARN,Stdout - -log4j.logger.org.apache.wicket=WARN -log4j.logger.org.wicketstuff=DEBUG diff --git a/serializer-kryo/src/test/resources/org/wicketstuff/pageserializer/kryo/HomePage.html b/serializer-kryo/src/test/resources/org/wicketstuff/pageserializer/kryo/HomePage.html deleted file mode 100644 index d5ab3fa91b..0000000000 --- a/serializer-kryo/src/test/resources/org/wicketstuff/pageserializer/kryo/HomePage.html +++ /dev/null @@ -1,26 +0,0 @@ - - - - - Apache Wicket Quickstart - - - - -
- -
-
-

Congratulations!

-

- . -

- Click -
-
-
- - diff --git a/serializer-kryo/src/test/webapp/WEB-INF/web.xml b/serializer-kryo/src/test/webapp/WEB-INF/web.xml deleted file mode 100644 index ea0592d007..0000000000 --- a/serializer-kryo/src/test/webapp/WEB-INF/web.xml +++ /dev/null @@ -1,32 +0,0 @@ - - - - quickstart - - - - - wicket.quickstart - org.apache.wicket.protocol.http.WicketFilter - - applicationClassName - org.wicketstuff.pageserializer.kryo.WicketApplication - - - - - wicket.quickstart - /* - - diff --git a/serializer-kryo/src/test/webapp/logo.png b/serializer-kryo/src/test/webapp/logo.png deleted file mode 100644 index 39ec54854b748ab6aeb6b3965d88f452772d7d8e..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 12244 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 i1O^!^0gjqN1OFf9qq%!F8)!QK0000`K diff --git a/serializer-kryo/src/test/webapp/style.css b/serializer-kryo/src/test/webapp/style.css deleted file mode 100644 index fc137cadb0..0000000000 --- a/serializer-kryo/src/test/webapp/style.css +++ /dev/null @@ -1,68 +0,0 @@ -body, p, li, a { font-family: georgia, times, serif;font-size:13pt;} -h1, h2, h3 { font-family: 'Yanone Kaffeesatz', arial, serif; } -body { margin:0;padding:0;} -#hd { - width : 100%; - height : 87px; - background-color : #092E67; - margin-top : 0; - padding-top : 10px; - border-bottom : 1px solid #888; - z-index : 0; -} -#ft { - position : absolute; - bottom : 0; - width : 100%; - height : 99px; - background-color : #6493D2; - border-top : 1px solid #888; - z-index : 0; -} -#logo,#bd { - width : 650px; - margin: 0 auto; - padding: 25px 50px 0 50px; -} -#logo h1 { - color : white; - font-size:36pt; - display: inline; -} -#logo img { - display:inline; - vertical-align: bottom; - margin-left : 50px; - margin-right : 5px; -} -body { margin-top : 0; padding-top : 0;} -#logo, #logo h1 { margin-top : 0; padding-top : 0;} -#bd { - position : absolute; - top : 75px; - bottom : 75px; - left : 50%; - margin-left : -325px; - z-index : 1; - overflow: auto; - background-color : #fff; - -webkit-border-radius: 10px; - -moz-border-radius: 10px; - border-radius: 10px; - -moz-box-shadow: 0px 0px 10px #888; - -webkit-box-shadow: 0px 0px 10px #888; - box-shadow: 0px 0px 10px #888; -} -a, a:visited, a:hover, a:active { - color : #6493D2; -} -h2 { - padding : 0; margin:0; - font-size:36pt; - color:#FF5500; -} -h3 { - padding : 0; margin:0; - font-size:24pt; - color:#092E67; -} \ No newline at end of file diff --git a/serializer-kryo2/pom.xml b/serializer-kryo2/pom.xml index 84c01a14fc..c24ffe6348 100644 --- a/serializer-kryo2/pom.xml +++ b/serializer-kryo2/pom.xml @@ -1,46 +1,40 @@ - - 4.0.0 + + 4.0.0 - - org.wicketstuff - wicketstuff-core - 8.0.0-SNAPSHOT - + + org.wicketstuff + wicketstuff-core + 8.0.0-SNAPSHOT + - wicketstuff-serializer-kryo2 + wicketstuff-serializer-kryo2 - WicketStuff Kryo2 serializer - ISerializer based on http://code.google.com/p/kryo/ (v2) + WicketStuff Kryo2 serializer + ISerializer based on https://github.com/magro/kryo-serializers (v4) - - - junit - junit - - - org.wicketstuff - wicketstuff-serializer-common - ${project.parent.version} - - - - de.javakaffee - kryo-serializers - 0.22 - - - org.eclipse.jetty.aggregate - jetty-all - uber - - + + org.wicketstuff + wicketstuff-serializer-common + ${project.parent.version} + + + de.javakaffee + kryo-serializers + 0.42 + + + org.eclipse.jetty.aggregate + jetty-all + uber + + diff --git a/serializer-kryo2/src/test/java/org/wicketstuff/pageserializer/kryo2/KryoSerializerTest.java b/serializer-kryo2/src/test/java/org/wicketstuff/pageserializer/kryo2/KryoSerializerTest.java index e777686c4d..582238c4d7 100644 --- a/serializer-kryo2/src/test/java/org/wicketstuff/pageserializer/kryo2/KryoSerializerTest.java +++ b/serializer-kryo2/src/test/java/org/wicketstuff/pageserializer/kryo2/KryoSerializerTest.java @@ -66,7 +66,7 @@ public void homepageRendersSuccessfully() Assert.assertNotNull("The produced data should not be null!", data); // data length can fluctuate based on the object field values - Assert.assertEquals("The produced data length is not correct!", 654, data.length); + Assert.assertEquals("The produced data length is not correct!", 659, data.length); Object object = pageSerializer.deserialize(data); Assert.assertTrue(