You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@bval.apache.org by dw...@apache.org on 2010/05/12 22:38:16 UTC
svn commit: r943674 - in /incubator/bval/trunk: ./ bval-json/ bval-json/src/main/java/org/apache/bval/json/ bval-json/src/main/java/org/apache/bval/json/json/ bval-json/src/main/java/org/apache/bval/optional/ bval-json/src/main/resources/org/apache/bva...

Author: dwoods
Date: Wed May 12 20:38:16 2010
New Revision: 943674

URL: http://svn.apache.org/viewvc?rev=943674&view=rev
Log:
BVAL-44 Move optional JSON code out of bval-core to a bval-json module, instead of creating a generic bval-optional module for now.

Added:
    incubator/bval/trunk/bval-json/
      - copied from r943661, incubator/bval/trunk/bval-optional/
    incubator/bval/trunk/bval-json/src/main/java/org/apache/bval/json/
      - copied from r943661, incubator/bval/trunk/bval-optional/src/main/java/org/apache/bval/optional/
    incubator/bval/trunk/bval-json/src/main/java/org/apache/bval/json/JSONGenerator.java
      - copied, changed from r943661, incubator/bval/trunk/bval-optional/src/main/java/org/apache/bval/optional/json/JSONGenerator.java
    incubator/bval/trunk/bval-json/src/main/resources/org/apache/bval/json/
      - copied from r943661, incubator/bval/trunk/bval-optional/src/main/resources/org/apache/bval/optional/
    incubator/bval/trunk/bval-json/src/main/resources/org/apache/bval/json/bean-infos-json.ftl
      - copied unchanged from r943661, incubator/bval/trunk/bval-optional/src/main/resources/org/apache/bval/optional/json/bean-infos-json.ftl
    incubator/bval/trunk/bval-json/src/test/java/org/apache/bval/json/
      - copied from r943661, incubator/bval/trunk/bval-optional/src/test/java/org/apache/bval/optional/
    incubator/bval/trunk/bval-json/src/test/java/org/apache/bval/json/JSONGeneratorTest.java
      - copied, changed from r943661, incubator/bval/trunk/bval-optional/src/test/java/org/apache/bval/optional/json/JSONGeneratorTest.java
Removed:
    incubator/bval/trunk/bval-json/src/main/java/org/apache/bval/json/json/
    incubator/bval/trunk/bval-json/src/main/java/org/apache/bval/optional/
    incubator/bval/trunk/bval-json/src/main/resources/org/apache/bval/json/json/
    incubator/bval/trunk/bval-json/src/main/resources/org/apache/bval/optional/
    incubator/bval/trunk/bval-json/src/test/java/org/apache/bval/json/json/
    incubator/bval/trunk/bval-json/src/test/java/org/apache/bval/optional/
    incubator/bval/trunk/bval-optional/
Modified:
    incubator/bval/trunk/bval-json/pom.xml
    incubator/bval/trunk/pom.xml

Modified: incubator/bval/trunk/bval-json/pom.xml
URL: http://svn.apache.org/viewvc/incubator/bval/trunk/bval-json/pom.xml?rev=943674&r1=943661&r2=943674&view=diff
==============================================================================
--- incubator/bval/trunk/bval-json/pom.xml (original)
+++ incubator/bval/trunk/bval-json/pom.xml Wed May 12 20:38:16 2010
@@ -30,11 +30,11 @@
         <version>0.1-incubating-SNAPSHOT</version>
     </parent>
 
-    <artifactId>bval-optional</artifactId>
-    <name>Apache Bean Validation :: bval-optional</name>
+    <artifactId>bval-json</artifactId>
+    <name>Apache Bean Validation :: bval-json</name>
     <packaging>bundle</packaging>
 
-    <description>Bean Validation Optional Components</description>
+    <description>Bean Validation - Optional JSON Component</description>
 
     <dependencies>
         <dependency>
@@ -70,25 +70,6 @@
             </resource>
         </resources>
 
-        <plugins>
-            <!-- create an OSGi bundle
-            <plugin>
-                <groupId>org.apache.felix</groupId>
-                <artifactId>maven-bundle-plugin</artifactId>
-                <extensions>true</extensions>
-                <configuration>
-                    <instructions>
-                        <Bundle-DocURL>${project.url}</Bundle-DocURL>
-                        <Bundle-Activator></Bundle-Activator>
-                        <Private-Package />
-                        <Export-Package>org.apache.bval.optional.*</Export-Package>
-                        <Eclipse-Autostart>false</Eclipse-Autostart>
-                        <Bundle-ClassPath>.</Bundle-ClassPath>
-                    </instructions>
-                </configuration>
-            </plugin>
--->
-        </plugins>
     </build>
 </project>
 

Copied: incubator/bval/trunk/bval-json/src/main/java/org/apache/bval/json/JSONGenerator.java (from r943661, incubator/bval/trunk/bval-optional/src/main/java/org/apache/bval/optional/json/JSONGenerator.java)
URL: http://svn.apache.org/viewvc/incubator/bval/trunk/bval-json/src/main/java/org/apache/bval/json/JSONGenerator.java?p2=incubator/bval/trunk/bval-json/src/main/java/org/apache/bval/json/JSONGenerator.java&p1=incubator/bval/trunk/bval-optional/src/main/java/org/apache/bval/optional/json/JSONGenerator.java&r1=943661&r2=943674&rev=943674&view=diff
==============================================================================
--- incubator/bval/trunk/bval-optional/src/main/java/org/apache/bval/optional/json/JSONGenerator.java (original)
+++ incubator/bval/trunk/bval-json/src/main/java/org/apache/bval/json/JSONGenerator.java Wed May 12 20:38:16 2010
@@ -14,7 +14,7 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-package org.apache.bval.optional.json;
+package org.apache.bval.json;
 
 import java.io.IOException;
 import java.io.StringWriter;

Copied: incubator/bval/trunk/bval-json/src/test/java/org/apache/bval/json/JSONGeneratorTest.java (from r943661, incubator/bval/trunk/bval-optional/src/test/java/org/apache/bval/optional/json/JSONGeneratorTest.java)
URL: http://svn.apache.org/viewvc/incubator/bval/trunk/bval-json/src/test/java/org/apache/bval/json/JSONGeneratorTest.java?p2=incubator/bval/trunk/bval-json/src/test/java/org/apache/bval/json/JSONGeneratorTest.java&p1=incubator/bval/trunk/bval-optional/src/test/java/org/apache/bval/optional/json/JSONGeneratorTest.java&r1=943661&r2=943674&rev=943674&view=diff
==============================================================================
--- incubator/bval/trunk/bval-optional/src/test/java/org/apache/bval/optional/json/JSONGeneratorTest.java (original)
+++ incubator/bval/trunk/bval-json/src/test/java/org/apache/bval/json/JSONGeneratorTest.java Wed May 12 20:38:16 2010
@@ -14,7 +14,7 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-package org.apache.bval.optional.json;
+package org.apache.bval.json;
 
 import junit.framework.TestCase;
 import org.apache.bval.MetaBeanManager;

Modified: incubator/bval/trunk/pom.xml
URL: http://svn.apache.org/viewvc/incubator/bval/trunk/pom.xml?rev=943674&r1=943673&r2=943674&view=diff
==============================================================================
--- incubator/bval/trunk/pom.xml (original)
+++ incubator/bval/trunk/pom.xml Wed May 12 20:38:16 2010
@@ -508,7 +508,7 @@
     <modules>
         <module>bval-core</module>
         <module>bval-jsr303</module>
-        <module>bval-optional</module>
+        <module>bval-json</module>
         <!-- <module>bval-tck</module> -->
     </modules>