diff --git a/framework/lib/jj-imaging.jar b/framework/lib/jj-imaging.jar new file mode 100644 index 0000000000..95a1245449 Binary files /dev/null and b/framework/lib/jj-imaging.jar differ diff --git a/framework/lib/jj-play-captcha.jar b/framework/lib/jj-play-captcha.jar deleted file mode 100644 index 41f633f7cf..0000000000 Binary files a/framework/lib/jj-play-captcha.jar and /dev/null differ diff --git a/framework/lib/jj-play-imaging.jar b/framework/lib/jj-play-imaging.jar deleted file mode 100644 index 67e86ab6e6..0000000000 Binary files a/framework/lib/jj-play-imaging.jar and /dev/null differ diff --git a/framework/lib/jj-play-textile.jar b/framework/lib/jj-play-textile.jar deleted file mode 100644 index 8d32e44708..0000000000 Binary files a/framework/lib/jj-play-textile.jar and /dev/null differ diff --git a/framework/lib/jj-play-wikitext.jar b/framework/lib/jj-play-wikitext.jar deleted file mode 100644 index 8994a275a0..0000000000 Binary files a/framework/lib/jj-play-wikitext.jar and /dev/null differ diff --git a/framework/lib/jj-simplecaptcha.jar b/framework/lib/jj-simplecaptcha.jar new file mode 100644 index 0000000000..1ae1f73096 Binary files /dev/null and b/framework/lib/jj-simplecaptcha.jar differ diff --git a/framework/lib/jj-textile.jar b/framework/lib/jj-textile.jar new file mode 100644 index 0000000000..a1478429fd Binary files /dev/null and b/framework/lib/jj-textile.jar differ diff --git a/framework/lib/jj-wikitext.jar b/framework/lib/jj-wikitext.jar new file mode 100644 index 0000000000..0f960623b3 Binary files /dev/null and b/framework/lib/jj-wikitext.jar differ diff --git a/framework/src/play/libs/Images.java b/framework/src/play/libs/Images.java index 10804f699d..1ea5f09fa9 100644 --- a/framework/src/play/libs/Images.java +++ b/framework/src/play/libs/Images.java @@ -18,15 +18,15 @@ import javax.imageio.ImageWriteParam; import javax.imageio.ImageWriter; import javax.imageio.stream.FileImageOutputStream; -import play.ns.nl.captcha.backgrounds.BackgroundProducer; -import play.ns.nl.captcha.backgrounds.FlatColorBackgroundProducer; -import play.ns.nl.captcha.backgrounds.GradiatedBackgroundProducer; -import play.ns.nl.captcha.backgrounds.SquigglesBackgroundProducer; -import play.ns.nl.captcha.backgrounds.TransparentBackgroundProducer; -import play.ns.nl.captcha.gimpy.GimpyRenderer; -import play.ns.nl.captcha.gimpy.RippleGimpyRenderer; -import play.ns.nl.captcha.noise.CurvedLineNoiseProducer; -import play.ns.nl.captcha.text.renderer.DefaultWordRenderer; +import jj.play.ns.nl.captcha.backgrounds.BackgroundProducer; +import jj.play.ns.nl.captcha.backgrounds.FlatColorBackgroundProducer; +import jj.play.ns.nl.captcha.backgrounds.GradiatedBackgroundProducer; +import jj.play.ns.nl.captcha.backgrounds.SquigglesBackgroundProducer; +import jj.play.ns.nl.captcha.backgrounds.TransparentBackgroundProducer; +import jj.play.ns.nl.captcha.gimpy.GimpyRenderer; +import jj.play.ns.nl.captcha.gimpy.RippleGimpyRenderer; +import jj.play.ns.nl.captcha.noise.CurvedLineNoiseProducer; +import jj.play.ns.nl.captcha.text.renderer.DefaultWordRenderer; import play.exceptions.UnexpectedException; import play.mvc.Http.Response; diff --git a/modules/docviewer/app/controllers/PlayDocumentation.java b/modules/docviewer/app/controllers/PlayDocumentation.java index 81f0033250..1cf26070d8 100644 --- a/modules/docviewer/app/controllers/PlayDocumentation.java +++ b/modules/docviewer/app/controllers/PlayDocumentation.java @@ -62,7 +62,7 @@ public static void file(String name) { // static String toHTML(String textile) { - String html = new play.org.eclipse.mylyn.wikitext.core.parser.MarkupParser(new play.org.eclipse.mylyn.wikitext.textile.core.TextileLanguage()).parseToHtml(textile); + String html = new jj.play.org.eclipse.mylyn.wikitext.core.parser.MarkupParser(new jj.play.org.eclipse.mylyn.wikitext.textile.core.TextileLanguage()).parseToHtml(textile); html = html.substring(html.indexOf("") + 6, html.lastIndexOf("")); return html; } diff --git a/nbproject/project.xml b/nbproject/project.xml index 399709f810..43a07c03eb 100644 --- a/nbproject/project.xml +++ b/nbproject/project.xml @@ -102,7 +102,7 @@ framework/src modules/test-runner/src - framework/lib/activation-1.1.1.jar:framework/lib/antlr-2.7.6.jar:framework/lib/asyncweb-common-0.9.0-SNAPSHOT.jar:framework/lib/bcprov-jdk15-142.jar:framework/lib/c3p0-0.9.1.2.jar:framework/lib/cglib-2.2.jar:framework/lib/commons-beanutils-1.8.3.jar:framework/lib/commons-codec-1.4.jar:framework/lib/commons-collections-3.1.jar:framework/lib/commons-email-1.2.jar:framework/lib/commons-fileupload-1.2.jar:framework/lib/commons-httpclient-3.1.jar:framework/lib/commons-io-1.4.jar:framework/lib/commons-lang-2.5.jar:framework/lib/commons-logging-1.1.1.jar:framework/lib/dom4j-1.6.1.jar:framework/lib/ehcache-core-2.0.0.jar:framework/lib/ezmorph-1.0.3.jar:framework/lib/groovy-all-1.7.1.jar:framework/lib/gson-1.4.jar:framework/lib/hibernate-annotations-3.5.0-Final.jar:framework/lib/hibernate-commons-annotations-3.2.0.Final.jar:framework/lib/hibernate-core-3.5.0-Final-patched.jar:framework/lib/hibernate-entitymanager-3.5.0-Final.jar:framework/lib/hibernate-jpa-2.0-api-1.0.0.Final.jar:framework/lib/hsqldb-1.8.1.2.jar:framework/lib/jamon-2.7.jar:framework/lib/javassist-3.9.0.GA.jar:framework/lib/jaxen-1.1.jar:framework/lib/jj-play-captcha.jar:framework/lib/jj-play-imaging.jar:framework/lib/jj-play-textile.jar:framework/lib/jj-play-wikitext.jar:framework/lib/jodatime-1.6.jar:framework/lib/jregex-1.2_01.jar:framework/lib/jsr107cache-1.0.jar:framework/lib/jta-1.1.jar:framework/lib/junit-4.8.1.jar:framework/lib/log4j-1.2.15.jar:framework/lib/mailapi-1.4.3.jar:framework/lib/memcached-2.4.2.jar:framework/lib/mina-core-2.0.0-M2-SNAPSHOT.jar:framework/lib/mysql-connector-java-5.1.8.jar:framework/lib/org.eclipse.jdt.core_3.5.1.v_972_R35x.jar:framework/lib/oval-1.50.jar:framework/lib/provided-servlet-2.5.jar:framework/lib/slf4j-api-1.5.8.jar:framework/lib/slf4j-log4j12-1.5.0.jar:framework/lib/snakeyaml-1.6.jar + framework/lib/activation-1.1.1.jar:framework/lib/antlr-2.7.6.jar:framework/lib/asyncweb-common-0.9.0-SNAPSHOT.jar:framework/lib/bcprov-jdk15-142.jar:framework/lib/c3p0-0.9.1.2.jar:framework/lib/cglib-2.2.jar:framework/lib/commons-beanutils-1.8.3.jar:framework/lib/commons-codec-1.4.jar:framework/lib/commons-collections-3.1.jar:framework/lib/commons-email-1.2.jar:framework/lib/commons-fileupload-1.2.jar:framework/lib/commons-httpclient-3.1.jar:framework/lib/commons-io-1.4.jar:framework/lib/commons-lang-2.5.jar:framework/lib/commons-logging-1.1.1.jar:framework/lib/dom4j-1.6.1.jar:framework/lib/ehcache-core-2.0.0.jar:framework/lib/ezmorph-1.0.3.jar:framework/lib/groovy-all-1.7.1.jar:framework/lib/gson-1.4.jar:framework/lib/hibernate-annotations-3.5.0-Final.jar:framework/lib/hibernate-commons-annotations-3.2.0.Final.jar:framework/lib/hibernate-core-3.5.0-Final-patched.jar:framework/lib/hibernate-entitymanager-3.5.0-Final.jar:framework/lib/hibernate-jpa-2.0-api-1.0.0.Final.jar:framework/lib/hsqldb-1.8.1.2.jar:framework/lib/jamon-2.7.jar:framework/lib/javassist-3.9.0.GA.jar:framework/lib/jaxen-1.1.jar:framework/lib/jj-imaging.jar:framework/lib/jj-simplecaptcha.jar:framework/lib/jj-textile.jar:framework/lib/jj-wikitext.jar:framework/lib/jodatime-1.6.jar:framework/lib/jregex-1.2_01.jar:framework/lib/jsr107cache-1.0.jar:framework/lib/jta-1.1.jar:framework/lib/junit-4.8.1.jar:framework/lib/log4j-1.2.15.jar:framework/lib/mailapi-1.4.3.jar:framework/lib/memcached-2.4.2.jar:framework/lib/mina-core-2.0.0-M2-SNAPSHOT.jar:framework/lib/mysql-connector-java-5.1.8.jar:framework/lib/org.eclipse.jdt.core_3.5.1.v_972_R35x.jar:framework/lib/oval-1.50.jar:framework/lib/provided-servlet-2.5.jar:framework/lib/slf4j-api-1.5.8.jar:framework/lib/slf4j-log4j12-1.5.0.jar:framework/lib/snakeyaml-1.6.jar framework/classes 1.5