Revision: 4082
Author: seba.wagner
Date: Sun Aug 21 02:57:06 2011
Log: Axis2 config and Spring integration (again)
http://code.google.com/p/openmeetings/source/detail?r=4082
Added:
/branches/dev/injection/src/test/org/openmeetings/test/smoke
/branches/dev/injection/src/test/org/openmeetings/test/smoke/SmokeTest.java
Modified:
/branches/dev/injection/WebContent/WEB-INF/openmeetings-applicationContext.xml
/branches/dev/injection/build.xml
/branches/dev/injection/build_openmeetings_jar.xml
/branches/dev/injection/src/META-INF/services.xml
/branches/dev/injection/src/userservice/org/openmeetings/axis/services/UserService.java
=======================================
--- /dev/null
+++
/branches/dev/injection/src/test/org/openmeetings/test/smoke/SmokeTest.java
Sun Aug 21 02:57:06 2011
@@ -0,0 +1,144 @@
+package org.openmeetings.test.smoke;
+
+import org.apache.log4j.Logger;
+import org.junit.Test;
+import org.openmeetings.app.installation.ImportInitvalues;
+import org.openmeetings.test.AbstractOpenmeetingsSpringTest;
+import org.springframework.beans.factory.annotation.Autowired;
+
+public class SmokeTest extends AbstractOpenmeetingsSpringTest {
+
+ private static final Logger log = Logger.getLogger(SmokeTest.class);
+
+ private static final String crypt_ClassName
= "org.openmeetings.utils.crypt.MD5Implementation";
+
+ private static final String configsmtpport = "25";
+
+ private static final String configsmtp = "smtp.webbase-design.de";
+
+ private static final String configmailuser = "xyz";
+
+ private static final String configdefault = "";
+
+ private static final String configmailpass = "qwertz";
+
+ private static final String configreferer = "[email protected]";
+
+ private static final String swf_path = "";
+
+ private static final String im_path = "";
+
+ private static final String configdefaultLang = "1";
+
+ private static final String mailusetls = "0";
+
+ private static final String sendEmailAtRegister = "0";
+
+ private static final String url_feed
= "http://groups.google.com/group/openmeetings-user/feed/atom_v1_0_msgs.xml";;
+
+ private static final String url_feed2
= "http://groups.google.com/group/openmeetings-dev/feed/atom_v1_0_msgs.xml";;
+
+ private static final String sendEmailWithVerficationCode = "0";
+
+ private static final String default_export_font = "TimesNewRoman";
+
+ private static final String screen_viewer = "4";
+
+ private static final String ffmpeg_path = "";
+
+ private static final String sip_enable = "0";
+
+ private static final String sox_path = "";
+
+ private static final String sip_proxyname = "";
+
+ private static final String sip_port = "";
+
+ private static final String sip_tunnel = "";
+
+ private static final String sip_realm = "";
+
+ private static final String sip_openxg_enable = "0";
+
+ private static final String sip_forcetunnel = "";
+
+ private static final String sip_codebase = "";
+
+ private static final String openxg_client_secret = "";
+
+ private static final String openxg_wrapper_url = "";
+
+ private static final String openxg_client_id = "";
+
+ private static final String openxg_client_domain = "";
+
+ private static final String openxg_community_code = "";
+
+ private static final String openxg_language_code = "";
+
+ private static final String openxg_adminid = "";
+
+ private static final String sip_language_phonecode = "";
+
+ private static final String sip_phonerange_start = "";
+
+ private static final String sip_phonerange = "";
+
+ private static final String username = "junit";
+
+ private static final String userpass = "test";
+
+ private static final String orgname = "smoketest";
+
+ private static final String timeZone = "";
+
+ private static final String useremail = null;
+
+ private static final String filePath = null;
+
+ @Autowired
+ private ImportInitvalues importInitvalues;
+
+ @Test
+ public void doInstallation() {
+ try {
+
+ importInitvalues.loadInitLanguages(url_feed);
+
+ importInitvalues.loadMainMenu();
+
+ importInitvalues.loadErrorMappingsFromXML(filePath);
+
+ importInitvalues.loadSalutations();
+
+ importInitvalues.loadConfiguration(crypt_ClassName,
configdefault,
+ configsmtp, configsmtpport,
configreferer, configmailuser,
+ configmailpass, mailusetls,
configdefaultLang, swf_path,
+ im_path, url_feed, url_feed2,
sendEmailAtRegister,
+ sendEmailWithVerficationCode,
default_export_font,
+ screen_viewer, ffmpeg_path, sox_path,
sip_enable,
+ sip_realm, sip_port, sip_proxyname,
sip_tunnel,
+ sip_codebase, sip_forcetunnel,
sip_openxg_enable,
+ openxg_wrapper_url, openxg_client_id,
openxg_client_secret,
+ openxg_client_domain,
openxg_community_code,
+ openxg_language_code, openxg_adminid,
+ sip_language_phonecode,
sip_phonerange_start,
+ sip_phonerange);
+
+ importInitvalues.loadInitUserAndOrganisation(username,
userpass,
+ useremail, orgname, timeZone);
+
+ importInitvalues.loadDefaultRooms();
+
+ // AppointMent Categories
+ importInitvalues.loadInitAppointmentCategories();
+
+ // Appointment Remindertypes
+ importInitvalues.loadInitAppointmentReminderTypes();
+
+ } catch (Exception err) {
+ log.error("[doInstallation]", err);
+ }
+ }
+
+}
=======================================
---
/branches/dev/injection/WebContent/WEB-INF/openmeetings-applicationContext.xml
Sat Aug 20 05:34:33 2011
+++
/branches/dev/injection/WebContent/WEB-INF/openmeetings-applicationContext.xml
Sun Aug 21 02:57:06 2011
@@ -246,9 +246,10 @@
<constructor-arg ref="mailTaskExecutor" />
</bean>
- <!-- Axis2 Spring Services Entry -->
+ <!-- Axis2 Spring Services Entry
<bean id="applicationContext"
class="org.apache.axis2.extensions.spring.receivers.ApplicationContextHolder"
/>
-
+ -->
+
<!-- Axis2 Services -->
<bean id="userServiceSoap"
class="org.openmeetings.axis.services.UserService" />
<bean id="roomServiceSoap"
class="org.openmeetings.axis.services.RoomService" />
=======================================
--- /branches/dev/injection/build.xml Sat Aug 20 11:08:18 2011
+++ /branches/dev/injection/build.xml Sun Aug 21 02:57:06 2011
@@ -60,10 +60,6 @@
<!-- Open JPA -->
<property name="openjpa.lib" value="${project.lib}/openjpa2"/>
- <!-- Log4j -->
- <property name="log4j.lib" value="${project.lib}/log4j" />
- <!-- Jakarta commons -->
- <property name="jakarta.common.lib"
value="${project.lib}/jakarta-commons" />
<!--JDBC Drivers-->
<property name="database.lib" value="${project.lib}/database" />
<property name="red5.lib" value="${basedir}/server/red5" />
@@ -92,11 +88,9 @@
<!-- compile classpath -->
<path id="compile.classpath">
- <fileset dir="${log4j.lib}" includes="*.jar"/>
<fileset dir="${openjpa.lib}" includes="*.jar"/>
<fileset dir="${spring.lib}" includes="*.jar"/>
<fileset dir="${project.lib}" includes="*.jar"/>
- <fileset dir="${jakarta.common.lib}" includes="*.jar"/>
<fileset dir="${red5.lib}" includes="*.jar"/>
<fileset dir="${red5.server.lib}" includes="*.jar"/>
<fileset dir="${upload.lib}" includes="*.jar"/>
@@ -152,6 +146,7 @@
<fileset dir="${spring.lib}"/>
</copy>
+ <!-- this package contains the javax.persistance.* API of
JAVA-EE-6 -->
<copy file="${openjpa.lib}/geronimo-jpa_2.0_spec-1.1.jar"
todir="${dist.dir}/red5/lib"/>
<copy
todir="${dist.dir}/red5/webapps/${project.distname}/WEB-INF/lib">
=======================================
--- /branches/dev/injection/build_openmeetings_jar.xml Sat Aug 20 11:08:18
2011
+++ /branches/dev/injection/build_openmeetings_jar.xml Sun Aug 21 02:57:06
2011
@@ -60,10 +60,6 @@
<!-- Open JPA -->
<property name="openjpa.lib" value="${project.lib}/openjpa2"/>
- <!-- Log4j -->
- <property name="log4j.lib" value="${project.lib}/log4j" />
- <!-- Jakarta commons -->
- <property name="jakarta.common.lib"
value="${project.lib}/jakarta-commons" />
<!--JDBC Drivers-->
<property name="database.lib" value="${project.lib}/database" />
<property name="red5.lib" value="${basedir}/server/red5" />
@@ -92,11 +88,9 @@
<!-- compile classpath -->
<path id="compile.classpath">
- <fileset dir="${log4j.lib}" includes="*.jar"/>
<fileset dir="${openjpa.lib}" includes="*.jar"/>
<fileset dir="${spring.lib}" includes="*.jar"/>
<fileset dir="${project.lib}" includes="*.jar"/>
- <fileset dir="${jakarta.common.lib}" includes="*.jar"/>
<fileset dir="${red5.lib}" includes="*.jar"/>
<fileset dir="${red5.server.lib}" includes="*.jar"/>
<fileset dir="${upload.lib}" includes="*.jar"/>
=======================================
--- /branches/dev/injection/src/META-INF/services.xml Sat Aug 20 11:08:18
2011
+++ /branches/dev/injection/src/META-INF/services.xml Sun Aug 21 02:57:06
2011
@@ -1,5 +1,5 @@
<serviceGroup>
-<!-- -->
+ <!--
<service name="SpringInit"
class="org.openmeetings.axis.services.SpringInit">
<description>Init Spring Framework</description>
<parameter
name="ServiceClass">org.openmeetings.axis.services.SpringInit</parameter>
@@ -9,10 +9,16 @@
<messageReceiver
class="org.apache.axis2.receivers.RawXMLINOutMessageReceiver"/>
</operation>
</service>
- <service name="UserService">
+ -->
+ <service name="UserService" >
<description>User Service</description>
- <parameter
name="ServiceObjectSupplier">org.apache.axis2.extensions.spring.receivers.SpringAppContextAwareObjectSupplier</parameter>
+ <!-- class="org.openmeetings.axis.services.UserService" -->
+ <!--
+ <parameter name="ServiceObjectSupplier"
locked="false">org.apache.axis2.extensions.spring.receivers.SpringAppContextAwareObjectSupplier</parameter>
+ -->
+
<parameter name="SpringBeanName"
locked="false">userServiceSoap</parameter>
+
<messageReceivers>
<messageReceiver
mep="http://www.w3.org/2004/08/wsdl/in-only";
@@ -21,10 +27,20 @@
mep="http://www.w3.org/2004/08/wsdl/in-out";
class="org.apache.axis2.rpc.receivers.RPCMessageReceiver"/>
</messageReceivers>
+
+ <parameter name="ServiceClass"
locked="xsd:false">org.openmeetings.axis.services.UserService</parameter>
+
+ <!--
+ <operation name="getSession">
+ <messageReceiver
class="org.apache.axis2.receivers.RawXMLINOutMessageReceiver"/>
+ </operation>
+ -->
+
</service>
+ <!--
<service name="RoomService">
<description>Room Service</description>
- <parameter
name="ServiceObjectSupplier">org.apache.axis2.extensions.spring.receivers.SpringAppContextAwareObjectSupplier</parameter>
+ <parameter name="ServiceObjectSupplier"
locked="false">org.apache.axis2.extensions.spring.receivers.SpringAppContextAwareObjectSupplier</parameter>
<parameter name="SpringBeanName"
locked="false">roomServiceSoap</parameter>
<messageReceivers>
<messageReceiver
@@ -37,7 +53,7 @@
</service>
<service name="FileService">
<description>File Service</description>
- <parameter
name="ServiceObjectSupplier">org.apache.axis2.extensions.spring.receivers.SpringAppContextAwareObjectSupplier</parameter>
+ <parameter name="ServiceObjectSupplier"
locked="false">org.apache.axis2.extensions.spring.receivers.SpringAppContextAwareObjectSupplier</parameter>
<parameter name="SpringBeanName"
locked="false">fileServiceSoap</parameter>
<messageReceivers>
<messageReceiver
@@ -48,4 +64,5 @@
class="org.apache.axis2.rpc.receivers.RPCMessageReceiver"/>
</messageReceivers>
</service>
+ -->
</serviceGroup>
=======================================
---
/branches/dev/injection/src/userservice/org/openmeetings/axis/services/UserService.java
Sat Aug 20 05:34:33 2011
+++
/branches/dev/injection/src/userservice/org/openmeetings/axis/services/UserService.java
Sun Aug 21 02:57:06 2011
@@ -3,6 +3,8 @@
import java.util.Date;
import org.apache.axis2.AxisFault;
+import org.apache.axis2.context.ConfigurationContext;
+import org.apache.axis2.description.AxisService;
import org.openmeetings.app.data.basic.AuthLevelmanagement;
import org.openmeetings.app.data.basic.Configurationmanagement;
import org.openmeetings.app.data.basic.ErrorManagement;
@@ -31,7 +33,17 @@
import com.thoughtworks.xstream.XStream;
import com.thoughtworks.xstream.io.xml.DomDriver;
-public class UserService {
+public class UserService implements
org.apache.axis2.engine.ServiceLifeCycle {
+
+ public void shutDown(ConfigurationContext arg0, AxisService arg1) {
+ // TODO Auto-generated method stub
+
+ }
+
+ public void startUp(ConfigurationContext arg0, AxisService arg1) {
+ // TODO Auto-generated method stub
+
+ }
private static final Logger log = Red5LoggerFactory.getLogger(
UserService.class,
ScopeApplicationAdapter.webAppRootKey);
--
You received this message because you are subscribed to the Google Groups
"OpenMeetings developers" group.
To post to this group, send email to [email protected].
To unsubscribe from this group, send email to
[email protected].
For more options, visit this group at
http://groups.google.com/group/openmeetings-dev?hl=en.
