[jjson] r57 committed - initial import struts2 plugin
codesite...@google.com
Author: grobmeier
Date: Fri Jul 1 03:33:32 2011
Log: initial import struts2 plugin
http://code.google.com/p/jjson/source/detail?r=57
Added:
/trunk/jjson-struts2
/trunk/jjson-struts2/.classpath
/trunk/jjson-struts2/.project
/trunk/jjson-struts2/.settings
/trunk/jjson-struts2/.settings/org.eclipse.jdt.core.prefs
/trunk/jjson-struts2/LICENSE.txt
/trunk/jjson-struts2/NOTICE.txt
/trunk/jjson-struts2/pom.xml
/trunk/jjson-struts2/src
/trunk/jjson-struts2/src/main
/trunk/jjson-struts2/src/main/java
/trunk/jjson-struts2/src/main/java/de
/trunk/jjson-struts2/src/main/java/de/grobmeier
/trunk/jjson-struts2/src/main/java/de/grobmeier/json
/trunk/jjson-struts2/src/main/java/de/grobmeier/json/plugins
/trunk/jjson-struts2/src/main/java/de/grobmeier/json/plugins/struts2
/trunk/jjson-struts2/src/main/java/de/grobmeier/json/plugins/struts2/JsonResult.java
/trunk/jjson-struts2/src/main/resources
/trunk/jjson-struts2/src/main/resources/struts-plugin.xml
/trunk/jjson-struts2/src/test
/trunk/jjson-struts2/src/test/java
/trunk/pom.xml
Deleted:
/trunk/.classpath
/trunk/.project
Modified:
/trunk/.settings/org.eclipse.jdt.core.prefs
/trunk/jjson/LICENSE.txt
/trunk/jjson/NOTICE.txt
/trunk/jjson/build.xml
/trunk/jjson/pom.xml
/trunk/jjson/src/main/java/de/grobmeier/jjson/JSONArray.java
/trunk/jjson/src/main/java/de/grobmeier/jjson/JSONBoolean.java
/trunk/jjson/src/main/java/de/grobmeier/jjson/JSONException.java
/trunk/jjson/src/main/java/de/grobmeier/jjson/JSONNull.java
/trunk/jjson/src/main/java/de/grobmeier/jjson/JSONNumber.java
/trunk/jjson/src/main/java/de/grobmeier/jjson/JSONObject.java
/trunk/jjson/src/main/java/de/grobmeier/jjson/JSONString.java
/trunk/jjson/src/main/java/de/grobmeier/jjson/JSONValue.java
/trunk/jjson/src/main/java/de/grobmeier/jjson/convert/JSONAnnotationDecoder.java
/trunk/jjson/src/main/java/de/grobmeier/jjson/convert/JSONAnnotationEncoder.java
/trunk/jjson/src/main/java/de/grobmeier/jjson/convert/JSONDecoder.java
/trunk/jjson/src/main/java/de/grobmeier/jjson/convert/JSONReflectionUtils.java
/trunk/jjson/src/test/java/de/grobmeier/jjson/JSONArrayTest.java
/trunk/jjson/src/test/java/de/grobmeier/jjson/JSONObjectTest.java
/trunk/jjson/src/test/java/de/grobmeier/jjson/convert/AnnotatedNestedSetClass.java
/trunk/jjson/src/test/java/de/grobmeier/jjson/convert/AnnotatedSetTestClass.java
/trunk/jjson/src/test/java/de/grobmeier/jjson/convert/AnnotatedTestClass.java
/trunk/jjson/src/test/java/de/grobmeier/jjson/convert/AnotherAnnotatedTestClass.java
/trunk/jjson/src/test/java/de/grobmeier/jjson/convert/JSONAnnotationDecoderTest.java
/trunk/jjson/src/test/java/de/grobmeier/jjson/convert/JSONAnnotationEncoderTest.java
/trunk/jjson/src/test/java/de/grobmeier/jjson/convert/JSONDecoderTest.java
=======================================
--- /dev/null
+++ /trunk/jjson-struts2/.classpath Fri Jul 1 03:33:32 2011
@@ -0,0 +1,20 @@
+<classpath>
+ <classpathentry kind="src" path="src/test/java"
output="target/test-classes" including="**/*.java"/>
+ <classpathentry kind="src" path="src/main/java" including="**/*.java"/>
+ <classpathentry kind="src" path="src/main/resources"
excluding="**/*.java"/>
+ <classpathentry kind="output" path="target/classes"/>
+ <classpathentry kind="var"
path="M2_REPO/javax/servlet/jsp-api/2.0/jsp-api-2.0.jar"/>
+ <classpathentry kind="var"
path="M2_REPO/javax/servlet/servlet-api/2.4/servlet-api-2.4.jar"/>
+ <classpathentry kind="var"
path="M2_REPO/commons-fileupload/commons-fileupload/1.2.1/commons-fileupload-1.2.1.jar"/>
+ <classpathentry kind="var"
path="M2_REPO/commons-io/commons-io/1.3.2/commons-io-1.3.2.jar"/>
+ <classpathentry kind="var"
path="M2_REPO/commons-logging/commons-logging/1.1.1/commons-logging-1.1.1.jar"/>
+ <classpathentry kind="var"
path="M2_REPO/org/freemarker/freemarker/2.3.15/freemarker-2.3.15.jar"/>
+ <classpathentry kind="var"
path="M2_REPO/jboss/javassist/3.7.ga/javassist-3.7.ga.jar"/>
+ <classpathentry kind="src" path="/jjson"/>
+ <classpathentry kind="var"
path="M2_REPO/junit/junit/4.8.1/junit-4.8.1.jar"
sourcepath="M2_REPO/junit/junit/4.8.1/junit-4.8.1-sources.jar"/>
+ <classpathentry kind="var"
path="M2_REPO/ognl/ognl/2.7.3/ognl-2.7.3.jar"/>
+ <classpathentry kind="var"
path="M2_REPO/org/springframework/spring-test/2.5.6/spring-test-2.5.6.jar"/>
+ <classpathentry kind="var"
path="M2_REPO/org/apache/struts/struts2-core/2.1.8.1/struts2-core-2.1.8.1.jar"/>
+ <classpathentry kind="var"
path="M2_REPO/com/opensymphony/xwork-core/2.1.6/xwork-core-2.1.6.jar"/>
+ <classpathentry kind="con"
path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
+</classpath>
=======================================
--- /dev/null
+++ /trunk/jjson-struts2/.project Fri Jul 1 03:33:32 2011
@@ -0,0 +1,15 @@
+<projectDescription>
+ <name>jjson-struts2</name>
+ <comment>JJSON is consisting of API and framework plugins for dealing
with the JSON specification. NO_M2ECLIPSE_SUPPORT: Project files created
with the maven-eclipse-plugin are not supported in M2Eclipse.</comment>
+ <projects>
+ <project>jjson</project>
+ </projects>
+ <buildSpec>
+ <buildCommand>
+ <name>org.eclipse.jdt.core.javabuilder</name>
+ </buildCommand>
+ </buildSpec>
+ <natures>
+ <nature>org.eclipse.jdt.core.javanature</nature>
+ </natures>
+</projectDescription>
=======================================
--- /dev/null
+++ /trunk/jjson-struts2/.settings/org.eclipse.jdt.core.prefs Fri Jul 1
03:33:32 2011
@@ -0,0 +1,9 @@
+#Fri Jul 01 12:16:46 CEST 2011
+encoding//src/test/java=UTF-8
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
+eclipse.preferences.version=1
+encoding//src/test/resources=UTF-8
+org.eclipse.jdt.core.compiler.source=1.5
+encoding//src/main/java=UTF-8
+encoding//src/main/resources=UTF-8
+org.eclipse.jdt.core.compiler.compliance=1.5
=======================================
--- /dev/null
+++ /trunk/jjson-struts2/LICENSE.txt Fri Jul 1 03:33:32 2011
@@ -0,0 +1,202 @@
+
+ Apache License
+ Version 2.0, January 2004
+ http://www.apache.org/licenses/
+
+ TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+ 1. Definitions.
+
+ "License" shall mean the terms and conditions for use, reproduction,
+ and distribution as defined by Sections 1 through 9 of this document.
+
+ "Licensor" shall mean the copyright owner or entity authorized by
+ the copyright owner that is granting the License.
+
+ "Legal Entity" shall mean the union of the acting entity and all
+ other entities that control, are controlled by, or are under common
+ control with that entity. For the purposes of this definition,
+ "control" means (i) the power, direct or indirect, to cause the
+ direction or management of such entity, whether by contract or
+ otherwise, or (ii) ownership of fifty percent (50%) or more of the
+ outstanding shares, or (iii) beneficial ownership of such entity.
+
+ "You" (or "Your") shall mean an individual or Legal Entity
+ exercising permissions granted by this License.
+
+ "Source" form shall mean the preferred form for making modifications,
+ including but not limited to software source code, documentation
+ source, and configuration files.
+
+ "Object" form shall mean any form resulting from mechanical
+ transformation or translation of a Source form, including but
+ not limited to compiled object code, generated documentation,
+ and conversions to other media types.
+
+ "Work" shall mean the work of authorship, whether in Source or
+ Object form, made available under the License, as indicated by a
+ copyright notice that is included in or attached to the work
+ (an example is provided in the Appendix below).
+
+ "Derivative Works" shall mean any work, whether in Source or Object
+ form, that is based on (or derived from) the Work and for which the
+ editorial revisions, annotations, elaborations, or other
modifications
+ represent, as a whole, an original work of authorship. For the
purposes
+ of this License, Derivative Works shall not include works that remain
+ separable from, or merely link (or bind by name) to the interfaces
of,
+ the Work and Derivative Works thereof.
+
+ "Contribution" shall mean any work of authorship, including
+ the original version of the Work and any modifications or additions
+ to that Work or Derivative Works thereof, that is intentionally
+ submitted to Licensor for inclusion in the Work by the copyright
owner
+ or by an individual or Legal Entity authorized to submit on behalf of
+ the copyright owner. For the purposes of this definition, "submitted"
+ means any form of electronic, verbal, or written communication sent
+ to the Licensor or its representatives, including but not limited to
+ communication on electronic mailing lists, source code control
systems,
+ and issue tracking systems that are managed by, or on behalf of, the
+ Licensor for the purpose of discussing and improving the Work, but
+ excluding communication that is conspicuously marked or otherwise
+ designated in writing by the copyright owner as "Not a Contribution."
+
+ "Contributor" shall mean Licensor and any individual or Legal Entity
+ on behalf of whom a Contribution has been received by Licensor and
+ subsequently incorporated within the Work.
+
+ 2. Grant of Copyright License. Subject to the terms and conditions of
+ this License, each Contributor hereby grants to You a perpetual,
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+ copyright license to reproduce, prepare Derivative Works of,
+ publicly display, publicly perform, sublicense, and distribute the
+ Work and such Derivative Works in Source or Object form.
+
+ 3. Grant of Patent License. Subject to the terms and conditions of
+ this License, each Contributor hereby grants to You a perpetual,
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+ (except as stated in this section) patent license to make, have made,
+ use, offer to sell, sell, import, and otherwise transfer the Work,
+ where such license applies only to those patent claims licensable
+ by such Contributor that are necessarily infringed by their
+ Contribution(s) alone or by combination of their Contribution(s)
+ with the Work to which such Contribution(s) was submitted. If You
+ institute patent litigation against any entity (including a
+ cross-claim or counterclaim in a lawsuit) alleging that the Work
+ or a Contribution incorporated within the Work constitutes direct
+ or contributory patent infringement, then any patent licenses
+ granted to You under this License for that Work shall terminate
+ as of the date such litigation is filed.
+
+ 4. Redistribution. You may reproduce and distribute copies of the
+ Work or Derivative Works thereof in any medium, with or without
+ modifications, and in Source or Object form, provided that You
+ meet the following conditions:
+
+ (a) You must give any other recipients of the Work or
+ Derivative Works a copy of this License; and
+
+ (b) You must cause any modified files to carry prominent notices
+ stating that You changed the files; and
+
+ (c) You must retain, in the Source form of any Derivative Works
+ that You distribute, all copyright, patent, trademark, and
+ attribution notices from the Source form of the Work,
+ excluding those notices that do not pertain to any part of
+ the Derivative Works; and
+
+ (d) If the Work includes a "NOTICE" text file as part of its
+ distribution, then any Derivative Works that You distribute must
+ include a readable copy of the attribution notices contained
+ within such NOTICE file, excluding those notices that do not
+ pertain to any part of the Derivative Works, in at least one
+ of the following places: within a NOTICE text file distributed
+ as part of the Derivative Works; within the Source form or
+ documentation, if provided along with the Derivative Works; or,
+ within a display generated by the Derivative Works, if and
+ wherever such third-party notices normally appear. The contents
+ of the NOTICE file are for informational purposes only and
+ do not modify the License. You may add Your own attribution
+ notices within Derivative Works that You distribute, alongside
+ or as an addendum to the NOTICE text from the Work, provided
+ that such additional attribution notices cannot be construed
+ as modifying the License.
+
+ You may add Your own copyright statement to Your modifications and
+ may provide additional or different license terms and conditions
+ for use, reproduction, or distribution of Your modifications, or
+ for any such Derivative Works as a whole, provided Your use,
+ reproduction, and distribution of the Work otherwise complies with
+ the conditions stated in this License.
+
+ 5. Submission of Contributions. Unless You explicitly state otherwise,
+ any Contribution intentionally submitted for inclusion in the Work
+ by You to the Licensor shall be under the terms and conditions of
+ this License, without any additional terms or conditions.
+ Notwithstanding the above, nothing herein shall supersede or modify
+ the terms of any separate license agreement you may have executed
+ with Licensor regarding such Contributions.
+
+ 6. Trademarks. This License does not grant permission to use the trade
+ names, trademarks, service marks, or product names of the Licensor,
+ except as required for reasonable and customary use in describing the
+ origin of the Work and reproducing the content of the NOTICE file.
+
+ 7. Disclaimer of Warranty. Unless required by applicable law or
+ agreed to in writing, Licensor provides the Work (and each
+ Contributor provides its Contributions) on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+ implied, including, without limitation, any warranties or conditions
+ of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+ PARTICULAR PURPOSE. You are solely responsible for determining the
+ appropriateness of using or redistributing the Work and assume any
+ risks associated with Your exercise of permissions under this
License.
+
+ 8. Limitation of Liability. In no event and under no legal theory,
+ whether in tort (including negligence), contract, or otherwise,
+ unless required by applicable law (such as deliberate and grossly
+ negligent acts) or agreed to in writing, shall any Contributor be
+ liable to You for damages, including any direct, indirect, special,
+ incidental, or consequential damages of any character arising as a
+ result of this License or out of the use or inability to use the
+ Work (including but not limited to damages for loss of goodwill,
+ work stoppage, computer failure or malfunction, or any and all
+ other commercial damages or losses), even if such Contributor
+ has been advised of the possibility of such damages.
+
+ 9. Accepting Warranty or Additional Liability. While redistributing
+ the Work or Derivative Works thereof, You may choose to offer,
+ and charge a fee for, acceptance of support, warranty, indemnity,
+ or other liability obligations and/or rights consistent with this
+ License. However, in accepting such obligations, You may act only
+ on Your own behalf and on Your sole responsibility, not on behalf
+ of any other Contributor, and only if You agree to indemnify,
+ defend, and hold each Contributor harmless for any liability
+ incurred by, or claims asserted against, such Contributor by reason
+ of your accepting any such warranty or additional liability.
+
+ END OF TERMS AND CONDITIONS
+
+ APPENDIX: How to apply the Apache License to your work.
+
+ To apply the Apache License to your work, attach the following
+ boilerplate notice, with the fields enclosed by brackets "[]"
+ replaced with your own identifying information. (Don't include
+ the brackets!) The text should be enclosed in the appropriate
+ comment syntax for the file format. We also recommend that a
+ file or class name and description of purpose be included on the
+ same "printed page" as the copyright notice for easier
+ identification within third-party archives.
+
+ Copyright [yyyy] [name of copyright owner]
+
+ 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.
=======================================
--- /dev/null
+++ /trunk/jjson-struts2/NOTICE.txt Fri Jul 1 03:33:32 2011
@@ -0,0 +1,5 @@
+JJSON - Struts 2 plugin
+Copyright 2002-2009 Christian Grobmeier
+
+This product includes software developed by
+Christian Grobmeier(http://www.grobmeier.de/).
=======================================
--- /dev/null
+++ /trunk/jjson-struts2/pom.xml Fri Jul 1 03:33:32 2011
@@ -0,0 +1,84 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/maven-v4_0_0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <artifactId>parent</artifactId>
+ <groupId>de.grobmeier.json</groupId>
+ <version>0.0.0-SNAPSHOT</version>
+ </parent>
+ <groupId>de.grobmeier.json</groupId>
+ <artifactId>jjson-struts2</artifactId>
+ <packaging>jar</packaging>
+ <version>1.0-SNAPSHOT</version>
+ <name>jjson-struts2</name>
+ <properties>
+ <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+ <struts2.version>2.1.8.1</struts2.version>
+ </properties>
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <version>2.0.2</version>
+ <configuration>
+ <source>1.5</source>
+ <target>1.5</target>
+ <encoding>UTF-8</encoding>
+ <compilerArgument />
+ </configuration>
+ </plugin>
+
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-jar-plugin</artifactId>
+ <version>2.3.1</version>
+ </plugin>
+
+ <!-- surefire -->
+ <plugin>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <version>2.9</version>
+ <configuration>
+ <encoding>UTF-8</encoding>
+ <argLine>'-Dfile.encoding=UTF-8'</argLine>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+
+ <dependencies>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>de.grobmeier.json</groupId>
+ <artifactId>jjson</artifactId>
+ <version>0.1.0-SNAPSHOT</version>
+ </dependency>
+ <!-- Struts 2 -->
+ <dependency>
+ <groupId>org.apache.struts</groupId>
+ <artifactId>struts2-core</artifactId>
+ <version>${struts2.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>com.opensymphony</groupId>
+ <artifactId>xwork-core</artifactId>
+ <version>2.1.6</version>
+ </dependency>
+ <dependency>
+ <groupId>javax.servlet</groupId>
+ <artifactId>servlet-api</artifactId>
+ <version>2.4</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>javax.servlet</groupId>
+ <artifactId>jsp-api</artifactId>
+ <version>2.0</version>
+ <scope>provided</scope>
+ </dependency>
+ </dependencies>
+</project>
=======================================
--- /dev/null
+++
/trunk/jjson-struts2/src/main/java/de/grobmeier/json/plugins/struts2/JsonResult.java
Fri Jul 1 03:33:32 2011
@@ -0,0 +1,138 @@
+/*
+ * Copyright 2007 Christian Grobmeier
+ *
+ * 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 de.grobmeier.json.plugins.struts2;
+
+import java.io.PrintWriter;
+import java.nio.charset.Charset;
+
+import javax.servlet.http.HttpServletResponse;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.apache.struts2.dispatcher.StrutsResultSupport;
+
+import com.opensymphony.xwork2.ActionInvocation;
+import com.opensymphony.xwork2.ActionSupport;
+
+import de.grobmeier.jjson.convert.JSONAnnotationEncoder;
+
+/**
+ *
+ * @author grobmeier
+ */
+public class JsonResult extends StrutsResultSupport {
+ /** Serial */
+ private static final long serialVersionUID = 2476992951577523951L;
+
+ /** Log */
+ private static final Log log = LogFactory.getLog(JsonResult.class);
+
+ private String charSet = "UTF-8";
+
+ /** Default constructor */
+ public JsonResult() {
+ }
+
+ /**
+ * @param location
+ */
+ public JsonResult(String location) {
+ super(location);
+ }
+
+ /*
+ * (non-Javadoc)
+ *
+ * @see
+ * org.apache.struts2.dispatcher.StrutsResultSupport#doExecute(java.lang
+ * .String, com.opensymphony.xwork2.ActionInvocation)
+ */
+ @Override
+ protected void doExecute(String finalLocation, ActionInvocation
invocation)
+ throws Exception {
+ Charset charset = null;
+ if (charSet != null) {
+ if (Charset.isSupported(charSet)) {
+ charset = Charset.forName(charSet);
+ } else {
+ charset = null;
+ }
+ }
+
+ HttpServletResponse response = (HttpServletResponse) invocation
+ .getInvocationContext().get(HTTP_RESPONSE);
+
+ if (charset != null) {
+ response.setContentType("application/json; charset=UTF-8");
+ } else {
+ response.setContentType("application/json");
+ }
+ response.setHeader("Content-Disposition", "inline");
+
+ // allows crosssite ajax - TODO: should be optional
+ response.setHeader("Access-Control-Allow-Origin", "*");
+ response.setHeader("Access-Control-Allow-Methods", "POST,GET");
+ response.setHeader("Access-Control-Allow-Credentials", "true");
+
+ PrintWriter writer = response.getWriter();
+ try {
+ if (!ActionSupport.SUCCESS.equals(invocation.getResultCode())) {
+ if(ActionSupport.LOGIN.equals(invocation.getResultCode())) {
+ response.sendError(401, "Not authorized");
+ return;
+ } else if("forbidden".equalsIgnoreCase(invocation.getResultCode())) {
+ response.sendError(403, "Request is not allowed");
+ return;
+ } else
if(ActionSupport.ERROR.equalsIgnoreCase(invocation.getResultCode())) {
+ response.sendError(500, "Server error");
+ return;
+ }
+
+ writer.write(new char[] { 'n', 'u', 'l', 'l' }, 0, 4);
+ return;
+ }
+ Object obj = invocation.getAction();
+ JSONAnnotationEncoder encoder = new JSONAnnotationEncoder();
+ String result = encoder.encode(obj);
+ log.debug("Encoded JSON: " + result);
+ writer.write(result);
+ } finally {
+ if (writer != null) {
+ writer.flush();
+ writer.close();
+ }
+ }
+ }
+
+ /**
+ * Set the character set
+ *
+ * @return The character set
+ */
+ public String getCharSet() {
+ return charSet;
+ }
+
+ /**
+ * Set the character set
+ *
+ * @param charSet
+ * The character set
+ */
+ public void setCharSet(String charSet) {
+ this.charSet = charSet;
+ }
+}
=======================================
--- /dev/null
+++ /trunk/jjson-struts2/src/main/resources/struts-plugin.xml Fri Jul 1
03:33:32 2011
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+
+<!DOCTYPE struts PUBLIC
+ "-//Apache Software Foundation//DTD Struts Configuration 2.1.7//EN"
+ "http://struts.apache.org/dtds/struts-2.1.7.dtd">
+
+<struts>
+ <package name="json-default" extends="struts-default">
+ <result-types>
+ <result-type name="json"
class="de.grobmeier.tab.plugins.json.JsonResult"/>
+ </result-types>
+ </package>
+</struts>
=======================================
--- /dev/null
+++ /trunk/pom.xml Fri Jul 1 03:33:32 2011
@@ -0,0 +1,53 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+
+ <groupId>de.grobmeier.json</groupId>
+ <artifactId>parent</artifactId>
+ <version>0.0.0-SNAPSHOT</version>
+ <packaging>pom</packaging>
+
+ <name>JJSON Multiproject</name>
+ <description>
+ JJSON is consisting of API and framework plugins for dealing with the
JSON specification.
+ </description>
+ <url>http:\\www.grobmeier.de</url>
+
+ <organization>
+ <name>Christian Grobmeier Software</name>
+ <url>http:\\www.grobmeier.de</url>
+ </organization>
+
+ <properties>
+ <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+ </properties>
+
+ <modules>
+ <module>jjson</module>
+ <module>jjson-struts2</module>
+ </modules>
+
+ <dependencyManagement>
+ <dependencies>
+ <!-- JUnit Tests -->
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>4.8.1</version>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+ </dependencyManagement>
+
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <configuration>
+ <source>1.5</source>
+ <target>1.5</target>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+</project>
=======================================
--- /trunk/.classpath Fri Jul 1 02:30:01 2011
+++ /dev/null
@@ -1,7 +0,0 @@
-<classpath>
- <classpathentry kind="src" path="src/test/java"
output="target/test-classes" including="**/*.java"/>
- <classpathentry kind="src" path="src/main/java" including="**/*.java"/>
- <classpathentry kind="output" path="target/classes"/>
- <classpathentry kind="var" path="M2_REPO/junit/junit/4.4/junit-4.4.jar"/>
- <classpathentry kind="con"
path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
-</classpath>
=======================================
--- /trunk/.project Fri Jul 1 02:30:01 2011
+++ /dev/null
@@ -1,13 +0,0 @@
-<projectDescription>
- <name>jjson</name>
- <comment>NO_M2ECLIPSE_SUPPORT: Project files created with the
maven-eclipse-plugin are not supported in M2Eclipse.</comment>
- <projects/>
- <buildSpec>
- <buildCommand>
- <name>org.eclipse.jdt.core.javabuilder</name>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>org.eclipse.jdt.core.javanature</nature>
- </natures>
-</projectDescription>
=======================================
--- /trunk/jjson/pom.xml Fri Jul 1 02:47:42 2011
+++ /trunk/jjson/pom.xml Fri Jul 1 03:33:32 2011
@@ -18,12 +18,17 @@
<project xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
- <groupId>de.grobmeier</groupId>
+ <parent>
+ <artifactId>parent</artifactId>
+ <groupId>de.grobmeier.json</groupId>
+ <version>0.0.0-SNAPSHOT</version>
+ </parent>
+ <groupId>de.grobmeier.json</groupId>
<artifactId>jjson</artifactId>
<packaging>jar</packaging>
<version>0.1.0-SNAPSHOT</version>
<name>jjson</name>
- <url>http://maven.apache.org</url>
+ <url>http://code.google.com/p/jjson</url>
<developers>
<developer>
<id>grobmeier</id>
@@ -47,6 +52,7 @@
<plugins>
<plugin>
<artifactId>maven-compiler-plugin</artifactId>
+ <version>2.0.2</version>
<configuration>
<source>1.5</source>
<target>1.5</target>
@@ -58,11 +64,13 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
+ <version>2.3.1</version>
</plugin>
<!-- surefire -->
<plugin>
<artifactId>maven-surefire-plugin</artifactId>
+ <version>2.9</version>
<configuration>
<encoding>UTF-8</encoding>
<argLine>'-Dfile.encoding=UTF-8'</argLine>