Revision: 4591
Author:   seba.wagner
Date:     Sat Nov 19 01:59:51 2011
Log:      Fixing some classpath problems
http://code.google.com/p/openmeetings/source/detail?r=4591

Modified:
 /trunk/singlewebapp/.classpath
 /trunk/singlewebapp/.settings/org.eclipse.jdt.core.prefs
 /trunk/singlewebapp/.settings/org.eclipse.wst.common.component
 /trunk/singlewebapp/WebContent/WEB-INF/openmeetings-applicationContext.xml

=======================================
--- /trunk/singlewebapp/.classpath      Fri Nov 18 11:42:48 2011
+++ /trunk/singlewebapp/.classpath      Sat Nov 19 01:59:51 2011
@@ -70,13 +70,12 @@
        <classpathentry kind="lib" path="lib/openjpa2/commons-lang-2.4.jar"/>
        <classpathentry kind="lib" path="lib/openjpa2/dom4j-1.6.1.jar"/>
<classpathentry kind="lib" path="lib/openjpa2/geronimo-jms_1.1_spec-1.1.1.jar"/> - <classpathentry kind="lib" path="lib/openjpa2/geronimo-jpa_2.0_spec-1.1.jar" sourcepath="C:/Users/swagner/.m2/repository/org/apache/geronimo/specs/geronimo-jpa_2.0_spec/1.1/geronimo-jpa_2.0_spec-1.1-sources.jar"/> + <classpathentry kind="lib" path="lib/openjpa2/geronimo-jpa_2.0_spec-1.1.jar" /> <classpathentry kind="lib" path="lib/openjpa2/geronimo-jta_1.1_spec-1.1.1.jar"/> <classpathentry kind="lib" path="lib/openjpa2/geronimo-validation_1.0_spec-1.1.jar"/>
        <classpathentry kind="lib" path="lib/openjpa2/openjpa-2.1.0.jar"/>
<classpathentry kind="lib" path="lib/openjpa2/org.apache.bval.bundle-0.2-incubating.jar"/>
        <classpathentry kind="lib" path="lib/openjpa2/serp-1.13.1.jar"/>
-       <classpathentry kind="lib" path="lib/slf4j/slf4j-api-1.5.10.jar"/>
        <classpathentry kind="lib" path="lib/upload/commons-digester-1.8.jar"/>
        <classpathentry kind="lib" 
path="lib/upload/commons-transaction-1.1.jar"/>
        <classpathentry kind="lib" path="lib/upload/multipartrequest.jar"/>
@@ -173,5 +172,11 @@
<classpathentry kind="lib" path="red5-1.0.0-r4297/dist/lib/quartz-1.8.5.jar"/>
        <classpathentry kind="lib" path="lib/mina/mina-core-2.0.4.jar"/>
<classpathentry kind="lib" path="WebContent/openmeetings/screen/kunststoff.jar"/> + <classpathentry kind="lib" path="lib/spring/org.springframework.aop-3.0.6.RELEASE.jar"/> + <classpathentry kind="lib" path="lib/spring/org.springframework.aspects-3.0.6.RELEASE.jar"/> + <classpathentry kind="lib" path="lib/spring/org.springframework.jdbc-3.0.6.RELEASE.jar"/> + <classpathentry kind="lib" path="lib/spring/org.springframework.orm-3.0.6.RELEASE.jar"/> + <classpathentry kind="lib" path="lib/spring/org.springframework.web.servlet-3.0.6.RELEASE.jar"/> + <classpathentry kind="lib" path="red5-1.0.0-r4297/dist/lib/com.springsource.org.aopalliance-1.0.0.jar"/>
        <classpathentry kind="output" path="build/classes"/>
 </classpath>
=======================================
--- /trunk/singlewebapp/.settings/org.eclipse.jdt.core.prefs Wed Oct 14 10:34:54 2009 +++ /trunk/singlewebapp/.settings/org.eclipse.jdt.core.prefs Sat Nov 19 01:59:51 2011
@@ -1,7 +1,12 @@
-#Wed Oct 14 19:22:28 CEST 2009
+#Sun Nov 06 12:11:27 CET 2011
 eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
 org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
+org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
 org.eclipse.jdt.core.compiler.compliance=1.5
+org.eclipse.jdt.core.compiler.debug.lineNumber=generate
+org.eclipse.jdt.core.compiler.debug.localVariable=generate
+org.eclipse.jdt.core.compiler.debug.sourceFile=generate
 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
 org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
 org.eclipse.jdt.core.compiler.source=1.5
=======================================
--- /trunk/singlewebapp/.settings/org.eclipse.wst.common.component Tue Nov 1 11:33:07 2011 +++ /trunk/singlewebapp/.settings/org.eclipse.wst.common.component Sat Nov 19 01:59:51 2011
@@ -2,16 +2,16 @@
 <project-modules id="moduleCoreId" project-version="1.5.0">
     <wb-module deploy-name="ROOT">
         <wb-resource deploy-path="/" source-path="/WebContent"/>
-<wb-resource deploy-path="/WEB-INF/classes" source-path="/red5-screenshare"/> + <wb-resource deploy-path="/WEB-INF/classes" source-path="/src/userservice"/> + <wb-resource deploy-path="/WEB-INF/classes" source-path="/src/roomservice"/> <wb-resource deploy-path="/WEB-INF/classes" source-path="/src/app"/> <wb-resource deploy-path="/WEB-INF/classes" source-path="/src/client"/> + <wb-resource deploy-path="/WEB-INF/classes" source-path="/src/test"/> <wb-resource deploy-path="/WEB-INF/classes" source-path="/src/fileservice"/> - <wb-resource deploy-path="/WEB-INF/classes" source-path="/src/roomservice"/> <wb-resource deploy-path="/WEB-INF/classes" source-path="/src/screenviewer"/> - <wb-resource deploy-path="/WEB-INF/classes" source-path="/src/server"/> <wb-resource deploy-path="/WEB-INF/classes" source-path="/src/templates"/> - <wb-resource deploy-path="/WEB-INF/classes" source-path="/src/test"/> - <wb-resource deploy-path="/WEB-INF/classes" source-path="/src/userservice"/> +<wb-resource deploy-path="/WEB-INF/classes" source-path="/red5-screenshare"/> + <wb-resource deploy-path="/WEB-INF/classes" source-path="/src/server"/> <wb-resource deploy-path="/WEB-INF/classes" source-path="/WebContent/WEB-INF"/>
         <wb-resource deploy-path="/WEB-INF/classes" source-path="/src"/>
         <property name="java-output-path"/>
=======================================
--- /trunk/singlewebapp/WebContent/WEB-INF/openmeetings-applicationContext.xml Sun Nov 6 05:52:37 2011 +++ /trunk/singlewebapp/WebContent/WEB-INF/openmeetings-applicationContext.xml Sat Nov 19 01:59:51 2011
@@ -20,6 +20,10 @@
                <property name="entityManagerFactory" ref="entityManagerFactory" 
/>
        </bean>

+       <tx:annotation-driven transaction-manager="jpaTransactionManager" />
+    <context:annotation-config />
+    <context:component-scan base-package="org.openmeetings"/>
+
     <!-- New Class for the Streaming Handlers -->
<bean id="web.handler" class="org.openmeetings.app.remote.red5.ScopeApplicationAdapter"/> <bean id="openmeetings.ClientListManager" class="org.openmeetings.app.remote.red5.ClientListManager" />
@@ -163,9 +167,4 @@
<bean id="backupExport" class="org.openmeetings.servlet.outputhandler.BackupExport" /> <bean id="backupImport" class="org.openmeetings.servlet.outputhandler.BackupImport" />

-       <tx:annotation-driven transaction-manager="jpaTransactionManager"/>
-
-       <context:annotation-config />
-       <context:component-scan base-package="org.openmeetings"/>
-
 </beans>

--
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.

Reply via email to