Author: rr
Date: Tue Dec 1 09:15:33 2009
New Revision: 885695
URL: http://svn.apache.org/viewvc?rev=885695&view=rev
Log:
ODE-712: Goodcompile test failure fix
Modified:
ode/branches/APACHE_ODE_1.X/Rakefile
ode/branches/APACHE_ODE_1.X/bpel-compiler/src/test/resources/log4j.properties
ode/branches/APACHE_ODE_1.X/utils/src/main/java/org/apache/ode/utils/xsd/SchemaModelImpl.java
Modified: ode/branches/APACHE_ODE_1.X/Rakefile
URL:
http://svn.apache.org/viewvc/ode/branches/APACHE_ODE_1.X/Rakefile?rev=885695&r1=885694&r2=885695&view=diff
==============================================================================
--- ode/branches/APACHE_ODE_1.X/Rakefile (original)
+++ ode/branches/APACHE_ODE_1.X/Rakefile Tue Dec 1 09:15:33 2009
@@ -277,6 +277,7 @@
COMMONS.logging, JAVAX.stream, JAXEN, SAXON, WSDL4J, XALAN, XERCES,
COMMONS.collections
test.resources {
filter(project("bpel-scripts").path_to("src/main/resources")).into(test.resources.target).run
}
package :jar
+ test.with SLF4J, LOG4J
end
desc "ODE JCA Connector Implementation"
Modified:
ode/branches/APACHE_ODE_1.X/bpel-compiler/src/test/resources/log4j.properties
URL:
http://svn.apache.org/viewvc/ode/branches/APACHE_ODE_1.X/bpel-compiler/src/test/resources/log4j.properties?rev=885695&r1=885694&r2=885695&view=diff
==============================================================================
---
ode/branches/APACHE_ODE_1.X/bpel-compiler/src/test/resources/log4j.properties
(original)
+++
ode/branches/APACHE_ODE_1.X/bpel-compiler/src/test/resources/log4j.properties
Tue Dec 1 09:15:33 2009
@@ -1,30 +1,36 @@
+#
+# 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.
#
-# 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.
+# The logging properties used during tests..
#
+log4j.rootLogger=INFO, file
+
+log4j.appender.file=org.apache.log4j.FileAppender
+log4j.appender.file.File=target/test/test.log
+log4j.appender.file.layout=org.apache.log4j.PatternLayout
+log4j.appender.file.layout.conversionpattern=%d{mm...@hh:mm:ss} %-5p (%13F:%L)
%3x - %m%n
-# Set root logger level to WARN and its only appender to CONSOLE
-log4j.rootLogger=WARN, CONSOLE
+log4j.appender.stdout=org.apache.log4j.ConsoleAppender
+log4j.appender.stdout.layout=org.apache.log4j.PatternLayout
+log4j.appender.stdout.layout.conversionpattern=%d{mm...@hh:mm:ss} %-5p
(%13F:%L) %3x - %m%n
-# log4j properties to work with commandline tools.
-log4j.category.org.mortbay=ERROR
-log4j.category.org.hibernate.type=WARN
-log4j.category.org.objectweb=ERROR
-#log4j.category.org.apache.ode.bpel.compiler=DEBUG
+log4j.category.org.apache.ode=DEBUG
-# Console appender
-log4j.appender.CONSOLE=org.apache.log4j.ConsoleAppender
-log4j.appender.CONSOLE.layout=org.apache.log4j.PatternLayout
-log4j.appender.CONSOLE.layout.ConversionPattern=%p - %C{1}.%M(%L) | %m%n
Modified:
ode/branches/APACHE_ODE_1.X/utils/src/main/java/org/apache/ode/utils/xsd/SchemaModelImpl.java
URL:
http://svn.apache.org/viewvc/ode/branches/APACHE_ODE_1.X/utils/src/main/java/org/apache/ode/utils/xsd/SchemaModelImpl.java?rev=885695&r1=885694&r2=885695&view=diff
==============================================================================
---
ode/branches/APACHE_ODE_1.X/utils/src/main/java/org/apache/ode/utils/xsd/SchemaModelImpl.java
(original)
+++
ode/branches/APACHE_ODE_1.X/utils/src/main/java/org/apache/ode/utils/xsd/SchemaModelImpl.java
Tue Dec 1 09:15:33 2009
@@ -189,6 +189,8 @@
String location = "";
if (resourceIdentifier.getNamespace() != null &&
_schemas.get(resourceIdentifier.getNamespace()) != null)
location = resourceIdentifier.getNamespace();
+ else if (resourceIdentifier.getLiteralSystemId() != null &&
_schemas.get(resourceIdentifier.getLiteralSystemId()) != null)
+ location = resourceIdentifier.getLiteralSystemId();
else if (resourceIdentifier.getExpandedSystemId() != null &&
_schemas.get(resourceIdentifier.getExpandedSystemId()) != null)
location = resourceIdentifier.getExpandedSystemId();
else {
