Skip to content
This repository has been archived by the owner on Nov 9, 2017. It is now read-only.

Commit

Permalink
Browse files Browse the repository at this point in the history
Merge branch '1.4' of github.com:zanata/zanata into 1.4
  • Loading branch information
Alex Eng committed Oct 24, 2011
2 parents 07c9e2e + c613e7f commit dbe977e
Show file tree
Hide file tree
Showing 5 changed files with 134 additions and 149 deletions.
3 changes: 3 additions & 0 deletions server/zanata-war/eclipse/launch/Integration_Tests.launch
View file
Expand Up @@ -7,12 +7,15 @@
<listAttribute key="org.eclipse.jdt.launching.CLASSPATH">
<listEntry value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#10;&lt;runtimeClasspathEntry containerPath=&quot;org.eclipse.jdt.launching.JRE_CONTAINER&quot; javaProject=&quot;zanata-war&quot; path=&quot;1&quot; type=&quot;4&quot;/&gt;&#10;"/>
<listEntry value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#10;&lt;runtimeClasspathEntry internalArchive=&quot;/zanata-war/src/test/jboss-embedded-bootstrap&quot; path=&quot;3&quot; type=&quot;2&quot;/&gt;&#10;"/>
<listEntry value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#10;&lt;runtimeClasspathEntry internalArchive=&quot;/zanata-war/src/main/webapp-jboss&quot; path=&quot;3&quot; type=&quot;2&quot;/&gt;&#10;"/>
<listEntry value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#10;&lt;runtimeClasspathEntry internalArchive=&quot;/zanata-war/src/main/webapp&quot; path=&quot;3&quot; type=&quot;2&quot;/&gt;&#10;"/>
<listEntry value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#10;&lt;runtimeClasspathEntry id=&quot;org.eclipse.jdt.launching.classpathentry.defaultClasspath&quot;&gt;&#10;&lt;memento exportedEntriesOnly=&quot;false&quot; project=&quot;zanata-war&quot;/&gt;&#10;&lt;/runtimeClasspathEntry&gt;&#10;"/>
</listAttribute>
<stringAttribute key="org.eclipse.jdt.launching.CLASSPATH_PROVIDER" value="org.eclipse.m2e.launchconfig.classpathProvider"/>
<booleanAttribute key="org.eclipse.jdt.launching.DEFAULT_CLASSPATH" value="false"/>
<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.testng.remote.RemoteTestNG"/>
<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="zanata-war"/>
<stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.m2e.launchconfig.sourcepathProvider"/>
<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Dsun.lang.ClassLoader.allowArraySyntax=true"/>
<mapAttribute key="org.testng.eclipse.ALL_CLASS_METHODS"/>
<listAttribute key="org.testng.eclipse.CLASS_TEST_LIST"/>
Expand Down
171 changes: 86 additions & 85 deletions server/zanata-war/pom.xml
View file
Expand Up @@ -263,9 +263,11 @@
</execution>
</executions>
<configuration>
<argLine>-Xmx1024m -XX:MaxPermSize=512m -XX:+UseConcMarkSweepGC
<argLine xml:space="preserve">-Xmx1024m -XX:MaxPermSize=512m -XX:+UseConcMarkSweepGC
-XX:+CMSClassUnloadingEnabled -XX:+HeapDumpOnOutOfMemoryError
-XX:HeapDumpPath=${project.build.directory}</argLine>
-XX:HeapDumpPath=${project.build.directory}
-Dsun.lang.ClassLoader.allowArraySyntax=true
</argLine>
<redirectTestOutputToFile>false</redirectTestOutputToFile>
<printSummary>true</printSummary>
<forkMode>always</forkMode>
Expand All @@ -278,7 +280,6 @@
</additionalClasspathElements>
<childDelegation>true</childDelegation>
<useSystemClassLoader>true</useSystemClassLoader>
<argLine xml:space="preserve">-Dsun.lang.ClassLoader.allowArraySyntax=true</argLine>
<classpathDependencyExcludes>
<classpathDependencyExclude>
<!-- collides with XMLLoginConfigImpl in jboss-embedded-all -->
Expand Down Expand Up @@ -933,13 +934,6 @@
<groupId>org.codehaus.jackson</groupId>
<artifactId>jackson-xc</artifactId>
</dependency>
<dependency>
<groupId>org.jboss.security</groupId>
<artifactId>jbosssx</artifactId>
<version>2.0.3.SP1</version>
<scope>provided</scope>
</dependency>


<!-- Drools -->

Expand Down Expand Up @@ -1056,6 +1050,83 @@
<artifactId>lucene-core</artifactId>
<version>2.9.2</version>
</dependency>

<!-- Testing dependencies -->

<dependency>
<groupId>org.zanata</groupId>
<artifactId>zanata-rest-client</artifactId>
<version>${project.version}</version>
<scope>test</scope>
</dependency>

<dependency>
<groupId>org.jboss.embedded</groupId>
<artifactId>jboss-embedded-all</artifactId>
<version>${jboss.embedded.version}</version>
<exclusions>
<exclusion>
<groupId>org.jboss.microcontainer</groupId>
<artifactId>jboss-deployers-client-spi</artifactId>
</exclusion>
<exclusion>
<groupId>org.jboss.embedded</groupId>
<artifactId>jboss-embedded</artifactId>
</exclusion>
</exclusions>
<scope>test</scope>
</dependency>

<dependency>
<groupId>org.jboss.embedded</groupId>
<artifactId>thirdparty-all</artifactId>
<version>${jboss.embedded.version}</version>
<scope>test</scope>
</dependency>

<dependency>
<groupId>org.jboss.seam.embedded</groupId>
<artifactId>jboss-embedded-api</artifactId>
<version>${jboss.embedded.version}</version>
<exclusions>
<exclusion>
<groupId>org.jboss.microcontainer</groupId>
<artifactId>jboss-deployers-client-spi</artifactId>
</exclusion>
</exclusions>
<scope>test</scope>
</dependency>

<dependency>
<groupId>mysql</groupId>
<artifactId>mysql-connector-java</artifactId>
<version>5.1.9</version>
<scope>test</scope>
</dependency>

<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<scope>test</scope>
</dependency>

<dependency>
<groupId>org.easytesting</groupId>
<artifactId>fest-assert</artifactId>
<version>1.3</version>
<scope>test</scope>
</dependency>

<dependency>
<groupId>org.easymock</groupId>
<artifactId>easymock</artifactId>
</dependency>

<dependency>
<groupId>org.testng</groupId>
<artifactId>testng</artifactId>
<!-- We use testng in DBUnitImporter so can't use test scope here -->
</dependency>

<!-- Container dependencies - provided by jboss -->

Expand Down Expand Up @@ -1126,84 +1197,14 @@
<groupId>xpp3</groupId>
<artifactId>xpp3_min</artifactId>
</dependency>

<!-- Testing dependencies -->


<dependency>
<groupId>org.zanata</groupId>
<artifactId>zanata-rest-client</artifactId>
<version>${project.version}</version>
<scope>test</scope>
</dependency>

<dependency>
<groupId>org.jboss.embedded</groupId>
<artifactId>jboss-embedded-all</artifactId>
<version>${jboss.embedded.version}</version>
<exclusions>
<exclusion>
<groupId>org.jboss.microcontainer</groupId>
<artifactId>jboss-deployers-client-spi</artifactId>
</exclusion>
<exclusion>
<groupId>org.jboss.embedded</groupId>
<artifactId>jboss-embedded</artifactId>
</exclusion>
</exclusions>
<scope>test</scope>
</dependency>

<dependency>
<groupId>org.jboss.embedded</groupId>
<artifactId>thirdparty-all</artifactId>
<version>${jboss.embedded.version}</version>
<scope>test</scope>
</dependency>

<dependency>
<groupId>org.jboss.seam.embedded</groupId>
<artifactId>jboss-embedded-api</artifactId>
<version>${jboss.embedded.version}</version>
<exclusions>
<exclusion>
<groupId>org.jboss.microcontainer</groupId>
<artifactId>jboss-deployers-client-spi</artifactId>
</exclusion>
</exclusions>
<scope>test</scope>
</dependency>

<dependency>
<groupId>mysql</groupId>
<artifactId>mysql-connector-java</artifactId>
<version>5.1.9</version>
<scope>test</scope>
<groupId>org.jboss.security</groupId>
<artifactId>jbosssx</artifactId>
<version>2.0.3.SP1</version>
<scope>provided</scope>
</dependency>

<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<scope>test</scope>
</dependency>

<dependency>
<groupId>org.easytesting</groupId>
<artifactId>fest-assert</artifactId>
<version>1.3</version>
<scope>test</scope>
</dependency>

<dependency>
<groupId>org.easymock</groupId>
<artifactId>easymock</artifactId>
</dependency>

<dependency>
<groupId>org.testng</groupId>
<artifactId>testng</artifactId>
<!-- We use testng in DBUnitImporter so can't use test scope here -->
</dependency>

<!-- GWT related dependencies -->

<dependency>
Expand Down
39 changes: 38 additions & 1 deletion server/zanata-war/src/main/resources/META-INF/components.xml
View file
Expand Up @@ -22,6 +22,12 @@
http://jboss.com/products/seam/components http://jboss.com/products/seam/components-2.1.xsd
http://jboss.com/products/seam/resteasy http://jboss.com/products/seam/resteasy-2.1.xsd">

<core:init
debug="@env.debug@"
transaction-management-enabled="true"
jndi-pattern="#{ejbName}/local"
distributable="false"/>

<!-- Conversation timeout: 20 minutes -->
<core:manager concurrent-request-timeout="4000"
conversation-timeout="1200000"
Expand All @@ -43,9 +49,40 @@
</drools:rule-files>
</drools:rule-base>

<security:rule-based-permission-resolver security-rules="#{securityRules}"/>

<!-- Persistence stuff -->

<security:rule-based-permission-resolver security-rules="#{securityRules}"/>
<!--
BOOTSTRAPPING A JPA ENTITYMANAGERFACTORY, SiA-9.3.1-p362
installed=true for JBoss 4.2.3 or newer
To have Seam defer loading of the persistence unit until it's needed, perhaps for a quicker
deployment turnaround, you can disable the startup behavior of this component, SiA-9.3.1-p363
entity-manager-factory name is also referenced in in persistence.xml
-->
<!-- FIXME zanataDatabase vs testDatabase -->
<persistence:entity-manager-factory
name="entityManagerFactory"
persistence-unit-name="@persistence-unit-name@"
installed="true"
startup="true" />

<!--
If Seam loads the persistence unit (JBoss 4.x), the
EntityManagerFactory will be resolved from #{${app.entity.manager.factory.name}}.
On JBoss AS 5, the EntityManagerFactory is retrieved from JNDI (the
binding occurs during application deployment), SiA-9.3.1-p362.
By default, the Seam-managed persistence context components are defined with the autocreate
feature disabled. By enabling this feature, you can inject these components using an
@In@ annotation without having to supply the create attribute, SiA-9.3.2-p366.
-->
<persistence:managed-persistence-context
name="entityManager"
auto-create="true"
entity-manager-factory="#{entityManagerFactory}"
persistence-unit-jndi-name="java:/zanataEntityManagerFactory" />

<security:jpa-identity-store
user-class="org.zanata.model.HAccount"
Expand Down
63 changes: 0 additions & 63 deletions server/zanata-war/src/main/webapp-jboss/WEB-INF/components.xml
View file

This file was deleted.

7 changes: 7 additions & 0 deletions server/zanata-war/src/test/jboss-embedded-bootstrap/deployers/ejb3-deployers-beans.xml
View file
Expand Up @@ -19,6 +19,13 @@
<property name="remoteProxyFactoryRegistry"><inject bean="EJB3RemoteProxyFactoryRegistry" /></property>
<property name="persistenceManagerFactoryRegistry"><inject bean="EJB3PersistenceManagerFactoryRegistry" /></property>

<property name="allowedSuffixes">
<set elementClass="java.lang.String">
<value>class</value>
<value>xml</value>
</set>
</property>

<!--
Configure the deployer to optionally require a deployment
Expand Down

0 comments on commit dbe977e

Please sign in to comment.