Commit b4c4e34a authored by mindthegab's avatar mindthegab
Browse files

fixed issue 129, fixed issue 148, fixed issue 149: - replaced Jetty with...

fixed issue 129, fixed issue 148, fixed issue 149: - replaced Jetty with Tomcat7 in both AMP and all-in-one; -removed WQS references in AMP and all-in-one project; -removed version specific web.xml overlays (used for alfresco <-> solr https comms) and added use of maven-replacer-plugin to patch distro OOTB files; -updated docs; -tested tomcat running successfully both in amp and all-in-one archetypes; -small non blocker glitch on class loading in maven tracked in issue 150

git-svn-id: http://maven-alfresco-archetypes.googlecode.com/svn/trunk@707 04253f4f-3451-0410-a141-5562f1e59037
parent 1e1430fb
Loading
Loading
Loading
Loading
+1 −1
Original line number Diff line number Diff line
@@ -6,7 +6,7 @@
  <artifactId>alfresco-allinone-archetype</artifactId>
  <packaging>maven-archetype</packaging>
  <name>All-in-One Archetype from Maven Alfresco SDK</name>
  <description>Sample multi-module project for All-in-One development on the Alfresco plaftorm. Includes modules for: Repository, AMP, Share, Solr, Web Quick Start and embedded Jetty run</description>
  <description>Sample multi-module project for All-in-One development on the Alfresco plaftorm. Includes modules for: Repository WAR overlay, Repository AMP, Share WAR overlay, Solr configuration, and embedded Tomcat runner</description>
  
  <parent>
    <groupId>org.alfresco.maven</groupId>
+1 −9
Original line number Diff line number Diff line
@@ -44,7 +44,7 @@
          </includes>
        </fileSet>
        <fileSet encoding="UTF-8" filtered="false">
          <directory>jetty</directory>
          <directory>tomcat</directory>
          <includes>
            <include>**</include>
          </includes>
@@ -119,14 +119,6 @@
      </fileSets>
    </module>
    <module id="runner" dir="runner" name="runner" filtered="false">
      <fileSets>
        <fileSet encoding="UTF-8">
          <directory>jetty</directory>
          <includes>
            <include>**</include>
          </includes>
        </fileSet>
      </fileSets>
    </module>
  </modules>
</archetype-descriptor>
+0 −16
Original line number Diff line number Diff line
<?xml version="1.0"?>
<!DOCTYPE Configure PUBLIC "-//Mort Bay Consulting//DTD Configure//EN" "http://jetty.mortbay.org/configure.dtd">

<Configure id="Server" class="org.mortbay.jetty.Server">
    <New id="myDataSource"
         class="org.mortbay.jetty.plus.naming.Resource">
        <Arg>jdbc/dataSource</Arg>
        <Arg>
            <New class="${alfresco.db.datasource.class}">
                <Set name="URL">${alfresco.db.url}</Set>
                <Set name="User">${alfresco.db.username}</Set>
                <Set name="Password">${alfresco.db.password}</Set>
            </New>
        </Arg>
    </New>
</Configure>
 No newline at end of file
+8 −4
Original line number Diff line number Diff line
@@ -26,10 +26,14 @@
    </dependencies>
    
    <properties>
        <!-- This property allow to switch Repo AMP vs Share AMP. 
             Set alfresco.client.war=share to run this AMP against Share
         -->
        <alfresco.client.war>alfresco</alfresco.client.war>
        <!-- Defines the target WAR artifactId to run this amp, only used with the -Pamp-to-war switch
        .    | Allowed values: alfresco | share. Defaults to a repository AMP, but could point to your custom corporate Alfresco WAR -->
        <alfresco.client.war>${alfresco_target_amp_client_war}</alfresco.client.war>
        <!-- Defines the target WAR groupId to run this amp, only used with the -Pamp-to-war switch
        .    | Could be org.alfresco | org.alfresco.enterprise or your corporate groupId -->
        <!-- <alfresco.client.war.groupId>org.alfresco</alfresco.client.war.groupId> -->
        <!-- Defines the target WAR version to run this amp, only used with the -Pamp-to-war switch -->
        <!-- <alfresco.client.war.version>${alfresco.version}</alfresco.client.war.version> -->
    </properties>
    
</project>
+11 −0
Original line number Diff line number Diff line
<?xml version="1.0" encoding="UTF-8"?>
<Context docBase="${alfresco.client.war.folder}" path="${alfresco.client.contextPath}">
  <!-- 
  <Environment override="false" type="java.lang.Boolean" name="properties/startup.enable" description="A flag that globally enables or disables startup of the major Alfresco subsystems." value="true"/>
  <Environment override="false" type="java.lang.String" name="properties/dir.root" description="The filesystem directory below which content and index data is stored. Should be on a shared disk if this is a clustered installation."/>
  <Environment override="false" type="java.lang.String" name="properties/hibernate.dialect" description="The fully qualified name of a org.hibernate.dialect.Dialect subclass that allows Hibernate to generate SQL optimized for a particular relational database. Choose from org.hibernate.dialect.DerbyDialect, org.hibernate.dialect.MySQLInnoDBDialect, org.alfresco.repo.domain.hibernate.dialect.AlfrescoOracle9Dialect, org.alfresco.repo.domain.hibernate.dialect.AlfrescoSybaseAnywhereDialect, org.alfresco.repo.domain.hibernate.dialect.AlfrescoSQLServerDialect, org.hibernate.dialect.PostgreSQLDialect"/>
  <Environment override="false" type="java.lang.String" name="properties/hibernate.query.substitutions" description="Mapping from tokens in Hibernate queries to SQL tokens. For PostgreSQL, set this to &quot;true TRUE, false FALSE&quot;."/>
  <Environment override="false" type="java.lang.Boolean" name="properties/hibernate.jdbc.use_get_generated_keys" description="Enable use of JDBC3 PreparedStatement.getGeneratedKeys() to retrieve natively generated keys after insert. Requires JDBC3+ driver. Set to false if your driver has problems with the Hibernate identifier generators. By default, tries to determine the driver capabilities using connection metadata."/>
  <Environment override="false" type="java.lang.String" name="properties/hibernate.default_schema" description="Qualify unqualified table names with the given schema/tablespace in generated SQL. It may be necessary to set this when the target database has more than one schema."/>
   -->
</Context>
Loading