Skip to content

Commit faf8e90

Browse files
author
restsql
committed
restSQL 0.8 adds JSON support
1 parent a05ad3b commit faf8e90

197 files changed

Lines changed: 1552 additions & 302 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.classpath‎

100755100644
Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<classpath>
33
<classpathentry kind="src" path="src"/>
4-
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
54
<classpathentry combineaccessrules="false" kind="src" path="/restsql"/>
65
<classpathentry kind="lib" path="lib/hamcrest-core-1.1.jar"/>
76
<classpathentry kind="lib" path="lib/hamcrest-library-1.1.jar"/>
@@ -16,5 +15,7 @@
1615
<classpathentry kind="lib" path="/restsql/lib/mysql-connector-java-5.1.14-bin.jar"/>
1716
<classpathentry kind="lib" path="/restsql/lib/commons-logging-1.1.1.jar"/>
1817
<classpathentry kind="lib" path="/restsql/lib/servlet-api.jar"/>
18+
<classpathentry kind="lib" path="/restsql/lib/json_simple-1.1.jar" sourcepath="/restsql/lib/json_simple-1.1-src.jar"/>
19+
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
1920
<classpathentry kind="output" path="obj/bin"/>
2021
</classpath>

‎.project‎

100755100644
File mode changed.

‎.settings/oracle.eclipse.tools.webtier.ui.prefs‎

100755100644
File mode changed.

‎.settings/org.eclipse.jdt.core.prefs‎

100755100644
File mode changed.

‎CONTRIBUTORS.txt‎

100755100644
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
11
restSQL Project Contributors
22

33
Mark Sawers <mark.sawers@restsql.org>
4+
Acshi Haggenmiller <acshikh@gmail.com>

‎LICENSE.txt‎

100755100644
File mode changed.

‎README.txt‎

100755100644
Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
README.txt (15-Jan-2011)
1+
README.txt (17-Jul-2012)
22

33
restSQL Test Deployment Guide
44

@@ -46,6 +46,10 @@ By default, the tests will use the restsql properties file src/resources/propert
4646

4747
Test results will appear on the console. Test detail is available in restsql-test/obj/test.
4848

49+
Note: The tests in the ReadOnlyColumns category are expected to fail for PostgreSQL.
50+
51+
Security tests are separately run in the api and http interface styles since the default profile of restsql is no security. (The java service interface does not support security tests). Before running the test-api-security or test-service-http-security, uncomment the security declarations in restsql/WebContent/WEB-INF/web.xml, uncomment the security.privileges property in restsql-test/src/resources/properties/restsql-xxx.properties and redeploy the web app.
52+
4953
-------------------------------------------------------------------------------
5054
License
5155

‎build.properties‎

100755100644
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# restsql-test build.properties
22

3-
test-compile.classpath=lib/jersey-client-1.5.jar;../restsql/lib/servlet-api.jar;../restsql/lib/commons-logging-1.1.1.jar;../restsql/lib/jsr311-api-1.1.1.jar;lib/junit-4.8.2.jar;lib/jmock-2.5.1.jar;obj/bin;../restsql/obj/bin
4-
test-exec.classpath=${test-compile.classpath};../restsql/lib/mysql-connector-java-5.1.14-bin.jar;../restsql/lib/postgresql-9.0-801.jdbc4.jar;../restsql/lib/jaxb-api.jar;../restsql/lib/jaxb-impl.jar;../restsql/lib/jersey-core-1.5.jar;lib/hamcrest-core-1.1.jar;lib/hamcrest-library-1.1.jar;../restsql/lib/log4j-1.2.16.jar
3+
test-compile.classpath=lib/jersey-client-1.5.jar;../restsql/lib/servlet-api.jar;../restsql/lib/commons-logging-1.1.1.jar;../restsql/lib/jsr311-api-1.1.1.jar;lib/junit-4.8.2.jar;lib/jmock-2.5.1.jar;../restsql/lib/json_simple-1.1.jar;obj/bin;../restsql/obj/bin
4+
test-exec.classpath=${test-compile.classpath};../restsql/lib/mysql-connector-java-5.1.14-bin.jar;../restsql/lib/postgresql-9.0-801.jdbc4.jar;../restsql/lib/jaxb-api.jar;../restsql/lib/jaxb-impl.jar;../restsql/lib/jersey-core-1.5.jar;lib/hamcrest-core-1.1.jar;lib/hamcrest-library-1.1.jar;../restsql/lib/commons-logging-1.1.1.jar;../restsql/lib/commons-lang-2.6.jar;../restsql/lib/log4j-1.2.16.jar;../restsql/lib/json_simple-1.1.jar
55

66
test.list=src/resources/xml/service/testcase/_tests.txt
77
org.restsql.baseUri=http://localhost:8080/restsql/

‎build.xml‎

100755100644
Lines changed: 42 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@
4242
</target>
4343

4444
<target name="exec-examples" description="executes sample programs">
45-
<ant antfile="../restsql-sdk/build.xml" target="exec-examples" />
45+
<ant antfile="../restsql-sdk/build.xml" target="exec-examples" inheritall="false" />
4646
</target>
4747

4848
<target name="test-api" depends="compile-tests" description="exercises junit tests for java api">
@@ -56,7 +56,23 @@
5656
<classpath path="${test-exec.classpath}" />
5757
<formatter type="xml" />
5858
<batchtest todir="${api-test.dir}">
59-
<fileset dir="src" includes="**/*Test.*" excludes="**/Base*.*" />
59+
<fileset dir="src" includes="**/*Test.*" excludes="**/Base*.*,org/restsql/security/**" />
60+
</batchtest>
61+
</junit>
62+
</target>
63+
64+
<target name="test-api-security" depends="compile-tests" description="exercises security junit tests for java api">
65+
<!-- Create output dir -->
66+
<delete dir="${api-test.dir}" />
67+
<mkdir dir="${api-test.dir}" />
68+
69+
<!-- Execute tests -->
70+
<junit fork="true" showoutput="true" printsummary="true" tempdir="${api-test.dir}" dir="${basedir}">
71+
<sysproperty key="org.restsql.properties" value="${org.restsql.properties}" />
72+
<classpath path="${test-exec.classpath}" />
73+
<formatter type="xml" />
74+
<batchtest todir="${api-test.dir}">
75+
<fileset dir="src" includes="org/restsql/security/*Test.*,org/restsql/security/impl/*Test.*" excludes="**/Base*.*" />
6076
</batchtest>
6177
</junit>
6278
</target>
@@ -78,36 +94,49 @@
7894

7995
<target name="test-service-http" description="executes all test cases for the http interface">
8096
<antcall target="-test-service">
81-
<param name="testStyle" value="http" />
82-
<param name="testList" value="%" />
97+
<param name="style" value="http" />
98+
<param name="scope" value="all" />
99+
<param name="exclude" value="Security" />
100+
</antcall>
101+
</target>
102+
103+
<target name="test-service-http-security" description="executes security test cases for the http interface">
104+
<antcall target="-test-service">
105+
<param name="style" value="http" />
106+
<param name="scope" value="Security" />
107+
<param name="exclude" value="none" />
83108
</antcall>
84109
</target>
85110

86111
<target name="test-service-http-subset" description="executes some of test cases for the http interface">
87112
<antcall target="-test-service">
88-
<param name="testStyle" value="http" />
89-
<param name="testList" value="${test.list}" />
113+
<param name="style" value="http" />
114+
<param name="scope" value="${test.list}" />
115+
<param name="exclude" value="none" />
90116
</antcall>
91117
</target>
92118

93-
<target name="test-service-java" description="executes all test cases for the service's java interface">
119+
<target name="test-service-java" description="executes all test cases for the service's java interface, excluding security">
94120
<antcall target="-test-service">
95-
<param name="testStyle" value="java" />
96-
<param name="testList" value="%" />
121+
<param name="style" value="java" />
122+
<param name="scope" value="all" />
123+
<param name="exclude" value="Security" />
97124
</antcall>
98125
</target>
99126

100127
<target name="test-service-java-subset" description="executes some test cases for the service's java interface">
101128
<antcall target="-test-service">
102-
<param name="testStyle" value="java" />
103-
<param name="testList" value="${test.list}" />
129+
<param name="style" value="java" />
130+
<param name="scope" value="${test.list}" />
131+
<param name="exclude" value="none" />
104132
</antcall>
105133
</target>
106134

107135
<target name="-test-service" depends="compile-tests">
108136
<java fork="true" classpath="${test-exec.classpath}" classname="org.restsql.service.ServiceTestRunner" dir="${basedir}">
109-
<arg value="${testStyle}" />
110-
<arg value="${testList}" />
137+
<arg value="${style}" />
138+
<arg value="${scope}" />
139+
<arg value="${exclude}" />
111140
<jvmarg value="-Dorg.restsql.baseUri=${org.restsql.baseUri}" />
112141
<jvmarg value="-Dorg.restsql.properties=${org.restsql.properties}" />
113142
</java>

‎lib/hamcrest-core-1.1.jar‎

100755100644
File mode changed.

0 commit comments

Comments
 (0)