You are viewing a plain text version of this content. The canonical link for it is here.
Posted to hise-commits@incubator.apache.org by rr...@apache.org on 2010/02/24 13:21:01 UTC
svn commit: r915780 - in /incubator/hise/trunk: hise-bundle/
hise-bundle/src/main/resources-itest/
hise-bundle/src/main/resources-itest/META-INF/
hise-bundle/src/main/resources-itest/META-INF/spring/
hise-bundle/src/main/resources/META-INF/spring/ hise...
Author: rr
Date: Wed Feb 24 13:21:00 2010
New Revision: 915780
URL: http://svn.apache.org/viewvc?rev=915780&view=rev
Log:
Added itest profile for hise-bundle
Added:
incubator/hise/trunk/hise-bundle/src/main/resources-itest/
incubator/hise/trunk/hise-bundle/src/main/resources-itest/META-INF/
incubator/hise/trunk/hise-bundle/src/main/resources-itest/META-INF/spring/
incubator/hise/trunk/hise-bundle/src/main/resources-itest/META-INF/spring/hise-itest.xml (with props)
incubator/hise/trunk/hise-bundle/src/main/resources/META-INF/spring/hise.xml (with props)
Removed:
incubator/hise/trunk/hise-bundle/src/main/resources/META-INF/spring/beans.xml
incubator/hise/trunk/hise-web/src/test/java/org/apache/hise/Test.java
incubator/hise/trunk/hise-web/src/test/java/org/apache/hise/TestImpl.java
Modified:
incubator/hise/trunk/hise-bundle/pom.xml
Modified: incubator/hise/trunk/hise-bundle/pom.xml
URL: http://svn.apache.org/viewvc/incubator/hise/trunk/hise-bundle/pom.xml?rev=915780&r1=915779&r2=915780&view=diff
==============================================================================
--- incubator/hise/trunk/hise-bundle/pom.xml (original)
+++ incubator/hise/trunk/hise-bundle/pom.xml Wed Feb 24 13:21:00 2010
@@ -33,6 +33,21 @@
<artifactId>hise-bundle</artifactId>
<version>0.2.0-SNAPSHOT</version>
<packaging>bundle</packaging>
+ <profiles>
+ <profile>
+ <id>itest</id>
+ <build>
+ <resources>
+ <resource>
+ <directory>src/main/resources-itest</directory>
+ </resource>
+ <resource>
+ <directory>src/main/resources</directory>
+ </resource>
+ </resources>
+ </build>
+ </profile>
+ </profiles>
<pluginRepositories>
<pluginRepository>
Added: incubator/hise/trunk/hise-bundle/src/main/resources-itest/META-INF/spring/hise-itest.xml
URL: http://svn.apache.org/viewvc/incubator/hise/trunk/hise-bundle/src/main/resources-itest/META-INF/spring/hise-itest.xml?rev=915780&view=auto
==============================================================================
--- incubator/hise/trunk/hise-bundle/src/main/resources-itest/META-INF/spring/hise-itest.xml (added)
+++ incubator/hise/trunk/hise-bundle/src/main/resources-itest/META-INF/spring/hise-itest.xml Wed Feb 24 13:21:00 2010
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>
+ <!--
+ ~ 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.
+ -->
+<beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:context="http://www.springframework.org/schema/context" xmlns:util="http://www.springframework.org/schema/util" xmlns:http-conf="http://cxf.apache.org/transports/http/configuration" xmlns:tx="http://www.springframework.org/schema/tx" xmlns:jaxws="http://cxf.apache.org/jaxws" xmlns:cxf="http://cxf.apache.org/core" xmlns:htd="http://www.example.org/WS-HT" xmlns:htda="http://www.example.org/WS-HT/api" xmlns:htdt="http://www.example.org/WS-HT/api/xsd" xmlns:htdaw="http://www.example.org/WS-HT/api/wsdl" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:ins="http://www.insurance.example.com/claims"
+ xsi:schemaLocation="
+ http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
+ http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-2.0.xsd
+ http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util-2.0.xsd
+ http://cxf.apache.org/transports/http/configuration http://cxf.apache.org/schemas/configuration/http-conf.xsd
+ http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
+ http://cxf.apache.org/jaxws http://cxf.apache.org/schemas/jaxws.xsd
+ http://cxf.apache.org/core http://cxf.apache.org/schemas/core.xsd
+ http://www.springframework.org/schema/tx http://www.springframework.org/schema/tx/spring-tx-2.5.xsd
+ ">
+
+ <jaxws:endpoint id="test" address="/test/" implementor="#test2" publish="true"/>
+
+ <bean id="test2" class="org.apache.hise.TestImpl">
+ <property name="transactionManager" ref="transactionManager"/>
+ <property name="hiseDao" ref="hiseDao"></property>
+ </bean>
+
+ <bean id="sampleUsers" class="org.apache.hise.SampleUsers" init-method="init">
+ <property name="hiseDao" ref="hiseDao"></property>
+ <property name="transactionManager" ref="transactionManager"></property>
+ </bean>
+
+</beans>
Propchange: incubator/hise/trunk/hise-bundle/src/main/resources-itest/META-INF/spring/hise-itest.xml
------------------------------------------------------------------------------
svn:eol-style = native
Added: incubator/hise/trunk/hise-bundle/src/main/resources/META-INF/spring/hise.xml
URL: http://svn.apache.org/viewvc/incubator/hise/trunk/hise-bundle/src/main/resources/META-INF/spring/hise.xml?rev=915780&view=auto
==============================================================================
--- incubator/hise/trunk/hise-bundle/src/main/resources/META-INF/spring/hise.xml (added)
+++ incubator/hise/trunk/hise-bundle/src/main/resources/META-INF/spring/hise.xml Wed Feb 24 13:21:00 2010
@@ -0,0 +1,124 @@
+<?xml version="1.0" encoding="UTF-8"?>
+ <!--
+ ~ 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.
+ -->
+<beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:context="http://www.springframework.org/schema/context" xmlns:util="http://www.springframework.org/schema/util" xmlns:http-conf="http://cxf.apache.org/transports/http/configuration" xmlns:tx="http://www.springframework.org/schema/tx" xmlns:jaxws="http://cxf.apache.org/jaxws" xmlns:cxf="http://cxf.apache.org/core" xmlns:htd="http://www.example.org/WS-HT" xmlns:htda="http://www.example.org/WS-HT/api" xmlns:htdt="http://www.example.org/WS-HT/api/xsd" xmlns:htdaw="http://www.example.org/WS-HT/api/wsdl" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:ins="http://www.insurance.example.com/claims"
+xmlns:osgi="http://www.springframework.org/schema/osgi"
+ xsi:schemaLocation="
+ http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
+ http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-2.0.xsd
+ http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util-2.0.xsd
+ http://cxf.apache.org/transports/http/configuration http://cxf.apache.org/schemas/configuration/http-conf.xsd
+ http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
+ http://cxf.apache.org/jaxws http://cxf.apache.org/schemas/jaxws.xsd
+ http://cxf.apache.org/core http://cxf.apache.org/schemas/core.xsd
+ http://www.springframework.org/schema/tx http://www.springframework.org/schema/tx/spring-tx-2.5.xsd
+ http://www.springframework.org/schema/osgi http://www.springframework.org/schema/osgi/spring-osgi.xsd
+ ">
+
+<!--
+ <import resource="classpath:META-INF/cxf/cxf.xml"/>
+ <import resource="classpath:META-INF/cxf/cxf-extension-soap.xml"/>
+ <import resource="classpath:META-INF/cxf/cxf-servlet.xml"/>
+-->
+ <import resource="classpath:META-INF/cxf/cxf.xml" />
+ <import resource="classpath:META-INF/cxf/cxf-extension-soap.xml" />
+ <import resource="classpath:META-INF/cxf/cxf-extension-http.xml" />
+ <import resource="classpath:META-INF/cxf/osgi/cxf-extension-osgi.xml" />
+
+<!--
+ <bean id="hisePasswordCallback" class="org.apache.hise.engine.MapPasswordCallback">
+ <property name="passwords" ref="hiseLoginProperties"/>
+ </bean>
+ -->
+
+<!--
+ <bean id="transactionHandler" class="org.apache.hise.engine.jaxws.TransactionHandler">
+ <property name="transactionManager" ref="transactionManager"/>
+ </bean>
+ -->
+
+ <bean id="hiseDao" class="org.apache.hise.dao.HISEDao">
+ <property name="entityManagerFactory" ref="htEntityManagerFactory"/>
+ </bean>
+
+ <bean id="hiseEngine" class="org.apache.hise.engine.HISEEngineImpl">
+ <property name="hiseDao" ref="hiseDao"/>
+ <property name="hiseScheduler" ref="hiseScheduler"/>
+ <property name="hiseUserDetails" ref="hiseUserDetails"/>
+ </bean>
+
+ <osgi:service id="hiseEngineOsgi" ref="hiseEngine" interface="org.apache.hise.api.HISEEngine" />
+
+
+ <bean id="hiseUserDetails" class="org.apache.hise.engine.DefaultHISEUserDetails">
+ <property name="hiseDao" ref="hiseDao"/>
+ </bean>
+
+ <bean id="hisePasswordCallback" class="org.apache.hise.engine.HISEPasswordCallback">
+ <property name="hiseUserDetails" ref="hiseUserDetails"/>
+ </bean>
+
+ <bean id="hiseScheduler" class="org.apache.hise.engine.HISEScheduler" init-method="init" destroy-method="destroy">
+ <property name="hiseEngine" ref="hiseEngine"/>
+ <property name="transactionManager" ref="transactionManager"/>
+ </bean>
+
+ <tx:annotation-driven transaction-manager="transactionManager"/>
+
+ <!--
+ <util:properties id="hiseLoginProperties" location="classpath:hise-login.properties"/>
+ -->
+
+ <bean id="transactionManager" class="org.springframework.orm.jpa.JpaTransactionManager">
+ <property name="entityManagerFactory" ref="htEntityManagerFactory"/>
+ <property name="dataSource" ref="dataSource"/>
+ </bean>
+ <osgi:service id="transactionManagerOsgi" interface="org.springframework.transaction.PlatformTransactionManager" ref="transactionManager"/>
+
+
+ <bean name="taskOperations" class="org.apache.hise.engine.jaxws.TaskOperationsImpl" init-method="init">
+ <property name="hiseEngine" ref="hiseEngine"/>
+ </bean>
+
+ <jaxws:endpoint id="taskOperationsEndpoint" name="taskOperationsEndpoint" address="/taskOperations/" implementor="#taskOperations" serviceName="htdaw:taskOperations" publish="true" wsdlLocation="classpath:ws-humantask.wsdl">
+ <!--
+ <jaxws:handlers>
+ <ref bean="transactionHandler"/>
+ </jaxws:handlers>
+ -->
+ <jaxws:inInterceptors>
+ <bean class="org.apache.cxf.ws.security.wss4j.WSS4JInInterceptor">
+ <constructor-arg>
+ <map>
+ <entry key="action" value="UsernameToken"/>
+ <entry key="passwordType" value="PasswordDigest"/>
+ <entry key="passwordCallbackRef">
+ <ref bean="hisePasswordCallback"/>
+ </entry>
+ </map>
+ </constructor-arg>
+ </bean>
+ </jaxws:inInterceptors>
+ </jaxws:endpoint>
+
+<!--
+ <bean id="logInbound" class="org.apache.cxf.interceptor.LoggingInInterceptor"/>
+ <bean id="logOutbound" class="org.apache.cxf.interceptor.LoggingOutInterceptor"/>
+ <cxf:bus>
+ <cxf:inInterceptors>
+ <ref bean="logInbound"/>
+ </cxf:inInterceptors>
+ <cxf:outInterceptors>
+ <ref bean="logOutbound"/>
+ </cxf:outInterceptors>
+ <cxf:inFaultInterceptors>
+ <ref bean="logInbound"/>
+ </cxf:inFaultInterceptors>
+ <cxf:outFaultInterceptors>
+ <ref bean="logOutbound"/>
+ </cxf:outFaultInterceptors>
+ </cxf:bus>
+-->
+</beans>
Propchange: incubator/hise/trunk/hise-bundle/src/main/resources/META-INF/spring/hise.xml
------------------------------------------------------------------------------
svn:eol-style = native