svn commit: r677366 - in /db/jdo/trunk/tck2: maven.xml src/conf/security.conf

[cl...@apache.org]

Author: clr
Date: Wed Jul 16 11:07:33 2008
New Revision: 677366

URL: http://svn.apache.org/viewvc?rev=677366&view=rev
Log:
JDO-555 Add security.conf to test security for JDOHelper

Added:
    db/jdo/trunk/tck2/src/conf/security.conf
Modified:
    db/jdo/trunk/tck2/maven.xml

Modified: db/jdo/trunk/tck2/maven.xml
URL: http://svn.apache.org/viewvc/db/jdo/trunk/tck2/maven.xml?rev=677366&r1=677365&r2=677366&view=diff
==============================================================================
--- db/jdo/trunk/tck2/maven.xml (original)
+++ db/jdo/trunk/tck2/maven.xml Wed Jul 16 11:07:33 2008
@@ -124,12 +124,6 @@
         <j:set var="true" value="true"/>
         <j:set var="false" value="false"/>
 
-        <j:if test="${jdo.tck.security}">
-            <j:set var="jdo.tck.security.jvmargs" 
-                value="-Djava.security.manager -Djava.security.policy=${basedir}/src/conf/security.policy"/>
-        <echo message="Running with Java security manager settings: ${jdo.tck.security.jvmargs}"/>
-        </j:if>
-
         <j:set var="cfglist" value="${jdo.tck.cfglist}"/>
         <j:if test="${cfglist == null}">
             <u:properties file="${basedir}/src/conf/configurations.list"/>
@@ -439,6 +433,12 @@
     </goal>
 
     <goal name="doRuntck.jdori">
+        <j:if test="${jdo.tck.security}">
+            <j:set var="jdo.tck.security.jvmargs" 
+                value="-Djava.security.manager -Djava.security.policy=${basedir}/src/conf/security.policy"/>
+        <echo message="Running with Java security manager settings: ${jdo.tck.security.jvmargs}"/>
+        </j:if>
+
         <path id="this.jdori.classpath">
             <pathelement location="${jdo.tck.enhanced.dir}/${jdo.tck.identitytype}.jar"/>
             <path refid="jdori.classpath"/>

Added: db/jdo/trunk/tck2/src/conf/security.conf
URL: http://svn.apache.org/viewvc/db/jdo/trunk/tck2/src/conf/security.conf?rev=677366&view=auto
==============================================================================
--- db/jdo/trunk/tck2/src/conf/security.conf (added)
+++ db/jdo/trunk/tck2/src/conf/security.conf Wed Jul 16 11:07:33 2008
@@ -0,0 +1,44 @@
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements.  See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You 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.
+
+jdo.tck.security = true
+jdo.tck.description = All pmf tests with standard mapping, no testdata. 
+jdo.tck.mapping.companyfactory =
+jdo.tck.testdata = 
+jdo.tck.standarddata = 
+jdo.tck.mapping = 0
+jdo.tck.requiredOptions =
+jdo.tck.classes = \
+org.apache.jdo.tck.api.persistencemanagerfactory.AfterCloseGetPMThrowsException \
+org.apache.jdo.tck.api.persistencemanagerfactory.AfterCloseSetMethodsThrowException \
+org.apache.jdo.tck.api.persistencemanagerfactory.AfterGetPersistenceManagerNoSetMethodsSucceed \
+org.apache.jdo.tck.api.persistencemanagerfactory.Close \
+org.apache.jdo.tck.api.persistencemanagerfactory.CloseFailsIfTransactionActive \
+org.apache.jdo.tck.api.persistencemanagerfactory.CloseWithoutPermissionThrowsSecurityException \
+org.apache.jdo.tck.api.persistencemanagerfactory.GetPMFByFile \
+org.apache.jdo.tck.api.persistencemanagerfactory.GetPMFByFileAndClassLoader \
+org.apache.jdo.tck.api.persistencemanagerfactory.GetPMFByResource \
+org.apache.jdo.tck.api.persistencemanagerfactory.GetPMFByResourceAndClassLoader \
+org.apache.jdo.tck.api.persistencemanagerfactory.GetPMFByStream \
+org.apache.jdo.tck.api.persistencemanagerfactory.GetPMFByStreamAndClassLoader \
+org.apache.jdo.tck.api.persistencemanagerfactory.GetPMFByJNDILocation \
+org.apache.jdo.tck.api.persistencemanagerfactory.GetPMFByJNDILocationAndClassLoader \
+org.apache.jdo.tck.api.persistencemanagerfactory.GetPersistenceManager \
+org.apache.jdo.tck.api.persistencemanagerfactory.GetPersistenceManagerForUser \
+org.apache.jdo.tck.api.persistencemanagerfactory.GetProperties \
+org.apache.jdo.tck.api.persistencemanagerfactory.config.Jdoconfig \
+org.apache.jdo.tck.api.persistencemanagerfactory.config.Persistence \
+org.apache.jdo.tck.api.persistencemanagerfactory.config.JDOConfigListener
+