Changeset 2695

Show
Ignore:
Timestamp:
01/20/10 15:22:47
Author:
douglm
Message:

JBoss support. First stage in deploying applications as services in jboss.

Restructure shell script builds to provide platform specific options. Use that feature to create jboss services (sar files) that can be deployed within the server.

All this work is based on jboss 5.1.0.GA

In addition there is some partial support for geronimo. This is not complete

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/build/buildfilters.xml

    r1988 r2695  
    5050    <filter token="LIFERAY-COMPANY-ID" 
    5151            value="${org.bedework.global.liferay.company-id}"/> 
     52 
     53    <filter token="JBOSS-DB-DATASOURCE" 
     54            value="${org.bedework.global.jboss.db.datasource.jndiname}"/> 
    5255 
    5356    <!--      Application settings            --> 

  • trunk/build/buildsh.xml

    r2368 r2695  
    1818  <import file="${build.dir}/buildfilters.xml" /> 
    1919 
     20  <import file="${build.dir}/platforms/${org.bedework.global.deploy.platform}Service.xml" /> 
     21 
    2022  <target name="init"> 
    2123    <!-- Destinations - where we build stuff --> 
    …… 
    2830    <property name="app.dest.properties" 
    2931              location="${app.dest.classes}/properties/calendar" /> 
    30     <property name="app.dest.resources" 
    31               location="${app.dest.home}/resources" /> 
    3232    <property name="app.dest.data" 
    3333              location="${app.dest.home}/data" /> 
    …… 
    4848    <mkdir dir="${app.dest.lib}" /> 
    4949 
    50     <!-- hibernate jars --> 
    51     <copy todir="${app.dest.lib}" file="${org.bedework.appjar.antlr}" /> 
    52     <copy todir="${app.dest.lib}" file="${org.bedework.appjar.asm-attrs}" /> 
    53     <copy todir="${app.dest.lib}" file="${org.bedework.appjar.asm}" /> 
    54     <copy todir="${app.dest.lib}" file="${org.bedework.appjar.cglib}" /> 
    55     <copy todir="${app.dest.lib}" file="${org.bedework.appjar.dom4j}" /> 
    56     <copy todir="${app.dest.lib}" file="${org.bedework.appjar.ehcache}" /> 
    57     <copy todir="${app.dest.lib}" file="${org.bedework.appjar.hibernate}" /> 
    58     <copy todir="${app.dest.lib}" file="${org.bedework.appjar.javassist}" /> 
    59     <copy todir="${app.dest.lib}" file="${org.bedework.appjar.jgroups}" /> 
    60     <copy todir="${app.dest.lib}" file="${org.bedework.appjar.jta}" /> 
    61     <copy todir="${app.dest.lib}" file="${org.bedework.appjar.commons-collections}"/> 
    62     <copy todir="${app.dest.lib}" file="${org.bedework.appjar.slf4j-api}" /> 
    63     <copy todir="${app.dest.lib}" file="${org.bedework.appjar.slf4j-log4j12}" /> 
    64  
    65     <!-- jms support --> 
    66     <copy todir="${app.dest.lib}" file="${org.bedework.appjar.activemq-core}" /> 
    67     <copy todir="${app.dest.lib}" 
    68           file="${org.bedework.appjar.geronimo-j2ee-management_1.0_spec}" /> 
    69     <copy todir="${app.dest.lib}" file="${org.bedework.appjar.jms}" /> 
    70  
    71     <copy todir="${app.dest.lib}" file="${org.bedework.appjar.commons-logging}"/> 
    72  
    73     <!-- core files --> 
    74  
    75     <copy todir="${app.dest.lib}" file="${org.bedework.appjar.rpiaccess}" /> 
    76     <copy todir="${app.dest.lib}" file="${org.bedework.appjar.rpiutil}" /> 
    77     <copy todir="${app.dest.lib}" file="${org.bedework.appjar.bw-davio}" /> 
    78  
    79     <copy todir="${app.dest.lib}" file="${org.bedework.appjar.bw-annotations}" /> 
    80     <copy todir="${app.dest.lib}" file="${org.bedework.appjar.bw-apiutil}" /> 
    81     <copy todir="${app.dest.lib}" file="${org.bedework.appjar.bw-calcore}" /> 
    82     <copy todir="${app.dest.lib}" file="${org.bedework.appjar.bw-calcorei}" /> 
    83     <copy todir="${app.dest.lib}" file="${org.bedework.appjar.bw-calfacade}" /> 
    84     <copy todir="${app.dest.lib}" file="${org.bedework.appjar.bw-calsvc}" /> 
    85     <copy todir="${app.dest.lib}" file="${org.bedework.appjar.bw-calsvci}" /> 
    86     <copy todir="${app.dest.lib}" file="${org.bedework.appjar.bw-icalendar}" /> 
    87     <copy todir="${app.dest.lib}" file="${org.bedework.appjar.bw-logging}" /> 
    88     <copy todir="${app.dest.lib}" file="${org.bedework.appjar.bw-mail}" /> 
    89     <copy todir="${app.dest.lib}" file="${org.bedework.appjar.bw-sysevents}" /> 
    90  
    91     <!-- any extra files--> 
    92    <copy todir="${app.dest.lib}" > 
    93      <fileset dir="${org.bedework.temp.extrajars.dir}" /> 
    94    </copy> 
    95  
    96     <!-- Some more standard libs --> 
    97     <copy todir="${app.dest.lib}" file="${org.bedework.appjar.log4j}"/> 
    98     <copy todir="${app.dest.lib}" file="${org.bedework.appjar.lucene-core}"/> 
    99     <copy todir="${app.dest.lib}" file="${org.bedework.appjar.lucene-misc}"/> 
    100     <copy todir="${app.dest.lib}" file="${org.bedework.appjar.ical4j}"/> 
    101     <copy todir="${app.dest.lib}" file="${org.bedework.appjar.commons-codec}"/> 
    102     <copy todir="${app.dest.lib}" file="${org.bedework.appjar.commons-digester}"/> 
    103     <copy todir="${app.dest.lib}" file="${org.bedework.appjar.commons-httpclient}"/> 
    104     <copy todir="${app.dest.lib}" file="${org.bedework.appjar.commons-lang}"/> 
    105     <copy todir="${app.dest.lib}" file="${org.bedework.appjar.commons-ssl}"/> 
    106  
    107     <!-- jdbc stuff --> 
    108  
    109     <if> 
    110       <available file="${org.bedework.global.ext.lib}/jdbc" type="dir" /> 
    111       <then> 
    112         <!-- jdbc drivers --> 
    113         <copy todir="${app.dest.lib}" flatten="yes" > 
    114           <!-- local jdbc drivers --> 
    115           <fileset dir="${org.bedework.global.ext.lib}/jdbc"> 
    116             <include name="*.jar"/> 
    117           </fileset> 
    118         </copy> 
    119       </then> 
    120       <else> 
    121         <!-- Include the quickstart jdbc driver --> 
    122         <copy todir="${app.dest.lib}" file="${org.bedework.appjar.hsqldb}"/> 
    123       </else> 
    124     </if> 
     50    <!-- Platform specific --> 
     51    <antcall target="addLibs" inheritRefs="true" /> 
    12552 
    12653    <copy todir="${app.dest.classes}"> 
    …… 
    13764          file="${org.bedework.config.sysevents.properties}" /> 
    13865 
    139     <copy todir="${app.dest.classes}" overwrite="yes" > 
    140       <fileset refid="org.bedework.extra.resources" /> 
    141       <filterset refid="property.filters" /> 
    142     </copy> 
     66    <if> 
     67      <isreference refid="org.bedework.extra.resources" /> 
     68      <then> 
     69        <copy todir="${app.dest.classes}" overwrite="yes" > 
     70          <fileset refid="org.bedework.extra.resources" /> 
     71          <filterset refid="property.filters" /> 
     72        </copy> 
     73      </then> 
     74    </if> 
     75 
     76    <!-- Platform specific hibernate properties --> 
     77    <antcall target="doHibProps" inheritRefs="true" /> 
    14378 
    14479    <!-- Create the env.properties file --> 
    …… 
    15287         =============================================================== --> 
    15388 
    154     <copy tofile="${app.dest.resources}/log4j.xml" 
    155           file="${org.bedework.runsh.log4j.xml}" 
    156           failonerror="false" /> 
     89    <!-- Platform specific --> 
     90    <antcall target="addResources" inheritRefs="true" /> 
    15791 
    15892    <!-- =============================================================== 
    …… 
    16094         =============================================================== --> 
    16195 
    162     <mkdir dir="${app.dest.data}" /> 
    163  
    164     <copy todir="${app.dest.data}" overwrite="yes" > 
    165       <fileset refid="org.bedework.shellscr.data" /> 
    166       <filterset refid="property.filters" /> 
    167     </copy> 
     96    <if> 
     97      <isreference refid="org.bedework.shellscr.data" /> 
     98      <then> 
     99        <mkdir dir="${app.dest.data}" /> 
     100     
     101        <copy todir="${app.dest.data}" overwrite="yes" > 
     102          <fileset refid="org.bedework.shellscr.data" /> 
     103          <filterset refid="property.filters" /> 
     104        </copy> 
     105      </then> 
     106    </if> 
    168107 
    169108    <!-- =============================================================== 
    170                        Build the classpath 
     109                       Add any extra stuff 
    171110         =============================================================== --> 
    172111 
    173     <path id="app.run.path"> 
    174       <fileset dir="${app.dest.lib}"> 
    175         <include name="*.jar"/> 
    176       </fileset> 
    177       <pathelement location="${app.dest.resources}" /> 
    178     </path> 
    179     <pathconvert property="app.run.cp" refid="app.run.path" 
    180                  targetos="unix" > 
    181       <map from="${app.dest.lib}" to="./lib"/> 
    182       <map from="${app.dest.resources}" to="./resources"/> 
    183     </pathconvert> 
    184     <pathconvert property="app.run.wincp" refid="app.run.path" 
    185                  targetos="windows" > 
    186       <map from="${app.dest.lib}" to="./lib"/> 
    187       <map from="${app.dest.resources}" to="./resources"/> 
    188     </pathconvert> 
     112    <!-- Platform specific --> 
     113    <antcall target="addExtras" inheritRefs="true" /> 
     114     
     115    <!-- ================================================================ 
     116         Build the zip file 
     117         ================================================================ --> 
    189118 
    190     <!-- =============================================================== 
    191                        Copy and modify the shell script 
    192          =============================================================== --> 
    193  
    194     <copy tofile="${app.dest.home}/${propval.app.shellscr.name}" 
    195           file="${app.run.shellscr}" > 
    196       <filterset> 
    197         <filter token="CP" 
    198                 value=".:./classes:${app.run.cp}"/> 
    199       </filterset> 
    200       <filterset refid="property.filters" /> 
    201     </copy> 
    202  
    203     <copy tofile="${app.dest.home}/${propval.app.batscr.name}" 
    204           file="${app.run.batscr}" > 
    205       <filterset> 
    206         <filter token="CP" 
    207                 value=".;./classes;${app.run.wincp}"/> 
    208       </filterset> 
    209       <filterset refid="property.filters" /> 
    210     </copy> 
    211  
    212     <!-- build the zip file --> 
    213119    <mkdir dir="${dist.home}" /> 
    214120    <delete file="${app.zip.file}" /> 
    …… 
    219125  </target> 
    220126</project> 
    221  

  • trunk/build/platforms/jbossWar.xml

    r2588 r2695  
    33<!-- =================================================================== 
    44     This file is imported by buildwar.xml and adds a target 
    5         doPortal 
     5        doPlatform 
    66     which will be invoked by the buildwar targets. 
    77     =================================================================== --> 
    …… 
    99<project name="bedework.platformWar" default="doPlatform" > 
    1010  <target name="doPlatform" > 
    11         <echo message="$$$$$$$$$$$$$$$ jbossWar.xml $$$$$$$$$$$$$$$$$$$$$$$" /> 
    1211    <!-- =============================================================== 
    1312         We create an updated jboss-web.xml file (for jboss) and a ear 

  • trunk/config/bwbuild/default/cal.options.xml

    r2541 r2695  
    213213 
    214214          <logPrefix>PubEventsAdmin</logPrefix> 
    215  
     215           
     216          <!-- Where the browser finds css and other resources -->     
     217          <browserResourceRoot>http://localhost:8080/caladminrsrc</browserResourceRoot> 
     218           
     219          <!-- Where the server finds xsl etc -->     
    216220          <appRoot>http://localhost:8080/caladminrsrc</appRoot> 
    217221        </CalAdmin> 
    …… 
    243247          <logPrefix>EventSubmit</logPrefix> 
    244248 
     249          <!-- Where the browser finds css and other resources -->     
     250          <browserResourceRoot>http://localhost:8080/eventsubmitrsrc</browserResourceRoot> 
     251           
     252          <!-- Where the server finds xsl etc -->     
    245253          <appRoot>http://localhost:8080/eventsubmitrsrc</appRoot> 
    246254 
    …… 
    275283          <logPrefix>PubEvents</logPrefix> 
    276284 
     285          <!-- Where the browser finds css and other resources -->     
     286          <browserResourceRoot>http://localhost:8080/calrsrc</browserResourceRoot> 
     287           
     288          <!-- Where the server finds xsl etc -->     
    277289          <appRoot>http://localhost:8080/calrsrc</appRoot> 
    278290 
    …… 
    311323          <logPrefix>Feeder</logPrefix> 
    312324 
     325          <!-- Where the browser finds css and other resources -->     
     326          <browserResourceRoot>http://localhost:8080/calfeedrsrc</browserResourceRoot> 
     327           
     328          <!-- Where the server finds xsl etc -->     
    313329          <appRoot>http://localhost:8080/calfeedrsrc</appRoot> 
    314330 
    …… 
    345361          <logPrefix>SoEDept</logPrefix> 
    346362 
     363          <!-- Where the browser finds css and other resources -->     
     364          <browserResourceRoot>http://localhost:8080/calrsrc</browserResourceRoot> 
     365           
     366          <!-- Where the server finds xsl etc -->     
    347367          <appRoot>http://localhost:8080/calrsrc</appRoot> 
    348368 
    …… 
    376396          <logPrefix>PersonalCalendar</logPrefix> 
    377397 
     398          <!-- Where the browser finds css and other resources -->     
     399          <browserResourceRoot>http://localhost:8080/ucalrsrc</browserResourceRoot> 
     400           
     401          <!-- Where the server finds xsl etc -->     
    378402          <appRoot>http://localhost:8080/ucalrsrc</appRoot> 
    379403 

  • trunk/config/bwbuild/default/cal.properties

    r2621 r2695  
    416416# -------------------------------------------------------------------- 
    417417# 
    418 # Crawler 
     418# Indexer 
    419419# 
    420420 

  • trunk/config/bwbuild/default/sysevents.properties

    r2473 r2695  
    66# use the following property to configure the default connector 
    77java.naming.provider.url = tcp://localhost:61616?trace=true 
     8 
     9// Allows us to handle container differences 
     10org.bedework.connection.factory.name=jms/BedeworkConnectionFactory 
    811 
    912# use the following property to specify the JNDI name the connection factory 

  • trunk/config/bwbuild/jboss/activemq.xml

    r2439 r2695  
    4444 
    4545  <broker xmlns="http://activemq.apache.org/schema/core" 
    46     brokerName="localhost" dataDirectory="${activemq.base}/data"> 
     46    brokerName="bedework" dataDirectory="${activemq.base}/data"> 
    4747    <!-- 
    4848      MikeD Queues for various bedework services. These are all fed by 
    …… 
    141141    </networkConnectors> 
    142142 
     143    <!-- High throughput but scalability problems - perhaps OK with <=500 connections 
    143144    <persistenceAdapter> 
    144145      <amqPersistenceAdapter syncOnWrite="false" 
    145         directory="${activemq.base}/data" maxFileLength="20 mb" /> 
     146        directory="../activemq-data" maxFileLength="20 mb" /> 
    146147    </persistenceAdapter> 
    147  
    148     <!-- Use the following if you wish to configure the journal with JDBC --> 
    149     <!-- 
     148    --> 
     149 
     150    <!-- Newer adapter - handles 1000s of connections --> 
    150151    <persistenceAdapter> 
    151         <journaledJDBC dataDirectory="${activemq.base}/data" dataSource="#postgres-ds"/> 
     152      <kahaDB directory="../data/activemq-data" journalMaxFileLength="32mb"/> 
    152153    </persistenceAdapter> 
    153     --> 
    154  
    155         <!-- Or if you want to use pure JDBC without a journal --> 
    156         <!-- 
    157         <persistenceAdapter> 
    158             <jdbcPersistenceAdapter dataSource="#postgres-ds"/> 
    159         </persistenceAdapter> 
    160           --> 
    161  
     154 
     155    <!-- older and slower is jdbcPersistenceAdapter --> 
     156 
     157    <!-- 
    162158    <sslContext> 
    163159      <sslContext keyStore="file:${activemq.base}/conf/broker.ks" 
    …… 
    166162                  trustStorePassword="password" /> 
    167163    </sslContext> 
     164    --> 
    168165 
    169166    <!-- 
    …… 
    188185    <!-- The transport connectors ActiveMQ will listen to --> 
    189186    <transportConnectors> 
    190       <transportConnector name="openwire" uri="tcp://localhost:61616" discoveryUri="multicast://default"/> 
    191       <transportConnector name="ssl" uri="ssl://localhost:61617"/> 
    192       <transportConnector name="stomp" uri="stomp://localhost:61613"/> 
     187      <transportConnector name="bedework" uri="tcp://localhost:61616" discoveryUri="multicast://default"/> 
     188      <!-- 
    193189      <transportConnector name="xmpp" uri="xmpp://localhost:61222"/> 
     190      --> 
    194191    </transportConnectors> 
    195192 
    …… 
    259256--> 
    260257 
    261   <!-- Postgres DataSource Sample Setup --> 
    262   <!-- 
    263   <bean id="postgres-ds" class="org.postgresql.ds.PGPoolingDataSource"> 
    264     <property name="serverName" value="localhost"/> 
    265     <property name="databaseName" value="activemq"/> 
    266     <property name="portNumber" value="0"/> 
    267     <property name="user" value="activemq"/> 
    268     <property name="password" value="activemq"/> 
    269     <property name="dataSourceName" value="postgres"/> 
    270     <property name="initialConnections" value="1"/> 
    271     <property name="maxConnections" value="10"/> 
    272   </bean> 
    273   --> 
    274  
    275   <!-- MySql DataSource Sample Setup --> 
    276   <!-- 
    277   <bean id="mysql-ds" class="org.apache.commons.dbcp.BasicDataSource" destroy-method="close"> 
    278     <property name="driverClassName" value="com.mysql.jdbc.Driver"/> 
    279     <property name="url" value="jdbc:mysql://localhost/activemq?relaxAutoCommit=true"/> 
    280     <property name="username" value="activemq"/> 
    281     <property name="password" value="activemq"/> 
    282     <property name="maxActive" value="200"/> 
    283     <property name="poolPreparedStatements" value="true"/> 
    284   </bean> 
    285   --> 
    286  
    287   <!-- Oracle DataSource Sample Setup --> 
    288   <!-- 
    289   <bean id="oracle-ds" class="org.apache.commons.dbcp.BasicDataSource" destroy-method="close"> 
    290     <property name="driverClassName" value="oracle.jdbc.driver.OracleDriver"/> 
    291     <property name="url" value="jdbc:oracle:thin:@localhost:1521:AMQDB"/> 
    292     <property name="username" value="scott"/> 
    293     <property name="password" value="tiger"/> 
    294     <property name="maxActive" value="200"/> 
    295     <property name="poolPreparedStatements" value="true"/> 
    296   </bean> 
    297   --> 
    298  
    299   <!-- Embedded Derby DataSource Sample Setup --> 
    300   <!-- 
    301   <bean id="derby-ds" class="org.apache.derby.jdbc.EmbeddedDataSource"> 
    302     <property name="databaseName" value="derbydb"/> 
    303     <property name="createDatabase" value="create"/> 
    304   </bean> 
    305   --> 
    306  
    307   <!-- MikeD - other speed up tips: Async Sends 
    308 queueConnectionFactory = new ActiveMQConnectionFactory(queue_user, queue_password, queue_url); 
    309 queueConnectionPool = new PooledConnectionFactory(queueConnectionFactory); 
    310 queueConnectionPool.setMaxConnections(200); 
    311  
    312 // This line is used to make your connection async 
    313 ((ActiveMQConnectionFactory)queueConnectionFactory).setUseAsyncSend(true); 
    314   --> 
    315  
    316258</beans> 
    317 <!-- END SNIPPET: example 
    318 --> 
     259 

  • trunk/config/bwbuild/jboss/cal.options.xml

    r2444 r2695  
    213213 
    214214          <logPrefix>PubEventsAdmin</logPrefix> 
    215  
     215           
     216          <!-- Where the browser finds css and other resources -->     
     217          <browserResourceRoot>http://localhost:8080/caladminrsrc</browserResourceRoot> 
     218           
     219          <!-- Where the server finds xsl etc -->     
    216220          <appRoot>http://localhost:8080/caladminrsrc</appRoot> 
    217221        </CalAdmin> 
    …… 
    243247          <logPrefix>EventSubmit</logPrefix> 
    244248 
     249          <!-- Where the browser finds css and other resources -->     
     250          <browserResourceRoot>http://localhost:8080/eventsubmitrsrc</browserResourceRoot> 
     251           
     252          <!-- Where the server finds xsl etc -->     
    245253          <appRoot>http://localhost:8080/eventsubmitrsrc</appRoot> 
    246254 
    …… 
    275283          <logPrefix>PubEvents</logPrefix> 
    276284 
     285          <!-- Where the browser finds css and other resources -->     
     286          <browserResourceRoot>http://localhost:8080/calrsrc</browserResourceRoot> 
     287           
     288          <!-- Where the server finds xsl etc -->     
    277289          <appRoot>http://localhost:8080/calrsrc</appRoot> 
    278290 
    …… 
    311323          <logPrefix>Feeder</logPrefix> 
    312324 
     325          <!-- Where the browser finds css and other resources -->     
     326          <browserResourceRoot>http://localhost:8080/calfeedrsrc</browserResourceRoot> 
     327           
     328          <!-- Where the server finds xsl etc -->     
    313329          <appRoot>http://localhost:8080/calfeedrsrc</appRoot> 
    314330 
    …… 
    345361          <logPrefix>SoEDept</logPrefix> 
    346362 
     363          <!-- Where the browser finds css and other resources -->     
     364          <browserResourceRoot>http://localhost:8080/calrsrc</browserResourceRoot> 
     365           
     366          <!-- Where the server finds xsl etc -->     
    347367          <appRoot>http://localhost:8080/calrsrc</appRoot> 
    348368 
    …… 
    376396          <logPrefix>PersonalCalendar</logPrefix> 
    377397 
     398          <!-- Where the browser finds css and other resources -->     
     399          <browserResourceRoot>http://localhost:8080/ucalrsrc</browserResourceRoot> 
     400           
     401          <!-- Where the server finds xsl etc -->     
    378402          <appRoot>http://localhost:8080/ucalrsrc</appRoot> 
    379403 

  • trunk/config/bwbuild/jboss/cal.properties

    r2621 r2695  
    1818# Define the names of the applications we want to build 
    1919org.bedework.install.app.names=CalAdmin,EventSubmit,Events,SoEDept,UserCal,\ 
    20  Pubcaldav,Usercaldav,caldavTest,test,dumpres 
     20 Pubcaldav,Usercaldav,caldavTest,test,dumpres,indexer,\ 
     21 sysevlog,iosched 
    2122 
    2223# 
    …… 
    2930# 'environment' options used globally by the system. 
    3031# 
    31 org.bedework.global.hibernate.dialect=org.hibernate.dialect.HSQLDialect 
    32  
    33 # Parameters for shell apps 
    34 org.bedework.global.jdbcdriver=org.hsqldb.jdbcDriver 
    35 org.bedework.global.jdbcurl=jdbc:hsqldb:hsql://localhost:1701 
     32org.bedework.global.hibernate.dialect=org.hibernate.dialect.DerbyDialect 
     33 
     34# Parameters for shell apps - set the db name in the url below 
     35org.bedework.global.jdbcdriver=org.apache.derby.jdbc.ClientDriver 
     36org.bedework.global.jdbcurl="jdbc:derby://localhost:1527/bedework3p6 
    3637org.bedework.global.jdbcid=sa 
    3738org.bedework.global.jdbcpw= 
     39 
     40# DB Datasource for jboss services 
     41# There doesn't appear to be the extra level of indirection that the jboss-web.xml 
     42# files allow so this will appear directly in the hibernate proeprties file for 
     43# jboss services. 
     44 
     45# Note - apparently the java Property classes preserve trailing blanks 
     46# Hibernate will include that trailing blank as part of the name leading to  
     47# much grief.  
     48org.bedework.global.jboss.db.datasource.jndiname=/CalendarDS 
    3849 
    3950# Hibernate caching parameters 
    …… 
    416427org.bedework.app.dumpres.schema.delimiter=; 
    417428 
     429# 
     430# -------------------------------------------------------------------- 
     431# 
     432# Indexer 
     433# 
     434 
     435org.bedework.app.indexer.project=indexer 
     436org.bedework.app.indexer.sou.dir= 
     437org.bedework.app.indexer.shellscr.name=bwrun 
     438org.bedework.app.indexer.batscr.name=bwrun.bat 
     439org.bedework.app.indexer.zip.name=indexer 
     440org.bedework.app.indexer.description=Bedework indexer application 
     441 
     442# 
     443# -------------------------------------------------------------------- 
     444# 
     445# Server events logger 
     446# 
     447 
     448org.bedework.app.sysevlog.project=calendarapi 
     449org.bedework.app.sysevlog.sou.dir= 
     450org.bedework.app.sysevlog.shellscr.name=bwrun 
     451org.bedework.app.sysevlog.batscr.name=bwrun.bat 
     452org.bedework.app.sysevlog.zip.name=bwsysevlog 
     453org.bedework.app.sysevlog.description=Bedework system events logger application 
     454 
     455# 
     456# -------------------------------------------------------------------- 
     457# 
     458# In/outbox scheduler 
     459# 
     460 
     461org.bedework.app.iosched.project=calendarapi 
     462org.bedework.app.iosched.sou.dir= 
     463org.bedework.app.iosched.shellscr.name=bwrun 
     464org.bedework.app.iosched.batscr.name=bwrun.bat 
     465org.bedework.app.iosched.zip.name=bwiosched 
     466org.bedework.app.iosched.description=Bedework In/outbox scheduler application 
     467 
     468 

  • trunk/config/bwbuild/jboss/sysevents.properties

    r2439 r2695  
    77java.naming.provider.url = tcp://localhost:61616?trace=true 
    88 
     9// Allows us to handle container differences 
     10org.bedework.connection.factory.name=java:activemq/QueueConnectionFactory 
     11 
    912# use the following property to specify the JNDI name the connection factory 
    1013# should appear as. 
    11 connectionFactoryNames = jms/BedeworkConnectionFactory 
     14connectionFactoryNames = activemq/QueueConnectionFactory 
    1215 
    1316# register some queues in JNDI using the form 
    …… 
    1619 
    1720queue.queue/syseventslog = bedework.sysevents.logger 
     21 
     22queue.queue/monitor = bedework.sysevents.monitor 
    1823 
    1924queue.queue/schedulerIn = bedework.scheduleIn 
    …… 
    2631# topic.[jndiName] = [physicalName] 
    2732#topic.MyTopic = example.MyTopic 
    28  
    29  
    30  
    31  
    32  
    33 # 
    34 # context.xml 
    35 #  <Resource name="jms/BedeworkConnectionFactory" 
    36 #            auth="Container" 
    37 #            type="org.apache.activemq.ActiveMQConnectionFactory" 
    38 #            description="JMS Connection Factory" 
    39 #            factory="org.apache.activemq.jndi.JNDIReferenceFactory" 
    40 #            brokerURL="tcp://localhost:61616?trace=true" 
    41 #            brokerName="LocalActiveMQBroker"/> 
    42 # 
    43 #  <!-- ActiveMQ System events queue --> 
    44 #  <Resource name="queue/sysevents" 
    45 #            auth="Container" 
    46 #            type="org.apache.activemq.command.ActiveMQQueue" 
    47 #            description="Bedework crawler queue" 
    48 #            factory="org.apache.activemq.jndi.JNDIReferenceFactory" 
    49 #            physicalName="bedework.sysevents"/> 
    50 # 
    51 #  <!-- ActiveMQ System events log queue --> 
    52 #  <Resource name="queue/syseventslog" 
    53 #            auth="Container" 
    54 #            type="org.apache.activemq.command.ActiveMQQueue" 
    55 #            description="Bedework crawler queue" 
    56 #            factory="org.apache.activemq.jndi.JNDIReferenceFactory" 
    57 #            physicalName="bedework.sysevents.logger"/> 
    58 # 
    59 #  <!-- ActiveMQ index crawler notifications queue --> 
    60 #  <Resource name="queue/crawler" 
    61 #            auth="Container" 
    62 #            type="org.apache.activemq.command.ActiveMQQueue" 
    63 #            description="Bedework crawler queue" 
    64 #            factory="org.apache.activemq.jndi.JNDIReferenceFactory" 
    65 #            physicalName="bedework.crawler"/> 

  • trunk/config/bwbuild/liferay5/sysevents.properties

    r2439 r2695  
    66# use the following property to configure the default connector 
    77java.naming.provider.url = tcp://localhost:61616?trace=true 
     8 
     9// Allows us to handle container differences 
     10org.bedework.connection.factory.name=jms/BedeworkConnectionFactory 
    811 
    912# use the following property to specify the JNDI name the connection factory 

  • trunk/config/bwbuild/mysql/cal.options.xml

    r2444 r2695  
    213213 
    214214          <logPrefix>PubEventsAdmin</logPrefix> 
    215  
     215           
     216          <!-- Where the browser finds css and other resources -->     
     217          <browserResourceRoot>http://localhost:8080/caladminrsrc</browserResourceRoot> 
     218           
     219          <!-- Where the server finds xsl etc -->     
    216220          <appRoot>http://localhost:8080/caladminrsrc</appRoot> 
    217221        </CalAdmin> 
    …… 
    243247          <logPrefix>EventSubmit</logPrefix> 
    244248 
     249          <!-- Where the browser finds css and other resources -->     
     250          <browserResourceRoot>http://localhost:8080/eventsubmitrsrc</browserResourceRoot> 
     251           
     252          <!-- Where the server finds xsl etc -->     
    245253          <appRoot>http://localhost:8080/eventsubmitrsrc</appRoot> 
    246254 
    …… 
    275283          <logPrefix>PubEvents</logPrefix> 
    276284 
     285          <!-- Where the browser finds css and other resources -->     
     286          <browserResourceRoot>http://localhost:8080/calrsrc</browserResourceRoot> 
     287           
     288          <!-- Where the server finds xsl etc -->     
    277289          <appRoot>http://localhost:8080/calrsrc</appRoot> 
    278290 
    …… 
    311323          <logPrefix>Feeder</logPrefix> 
    312324 
     325          <!-- Where the browser finds css and other resources -->     
     326          <browserResourceRoot>http://localhost:8080/calfeedrsrc</browserResourceRoot> 
     327           
     328          <!-- Where the server finds xsl etc -->     
    313329          <appRoot>http://localhost:8080/calfeedrsrc</appRoot> 
    314330 
    …… 
    345361          <logPrefix>SoEDept</logPrefix> 
    346362 
     363          <!-- Where the browser finds css and other resources -->     
     364          <browserResourceRoot>http://localhost:8080/calrsrc</browserResourceRoot> 
     365           
     366          <!-- Where the server finds xsl etc -->     
    347367          <appRoot>http://localhost:8080/calrsrc</appRoot> 
    348368 
    …… 
    376396          <logPrefix>PersonalCalendar</logPrefix> 
    377397 
     398          <!-- Where the browser finds css and other resources -->     
     399          <browserResourceRoot>http://localhost:8080/ucalrsrc</browserResourceRoot> 
     400           
     401          <!-- Where the server finds xsl etc -->     
    378402          <appRoot>http://localhost:8080/ucalrsrc</appRoot> 
    379403 

  • trunk/config/bwbuild/mysql/sysevents.properties

    r2439 r2695  
    66# use the following property to configure the default connector 
    77java.naming.provider.url = tcp://localhost:61616?trace=true 
     8 
     9// Allows us to handle container differences 
     10org.bedework.connection.factory.name=jms/BedeworkConnectionFactory 
    811 
    912# use the following property to specify the JNDI name the connection factory 

  • trunk/config/bwbuild/oracle10g/cal.options.xml

    r2444 r2695  
    213213 
    214214          <logPrefix>PubEventsAdmin</logPrefix> 
    215  
     215           
     216          <!-- Where the browser finds css and other resources -->     
     217          <browserResourceRoot>http://localhost:8080/caladminrsrc</browserResourceRoot> 
     218           
     219          <!-- Where the server finds xsl etc -->     
    216220          <appRoot>http://localhost:8080/caladminrsrc</appRoot> 
    217221        </CalAdmin> 
    …… 
    243247          <logPrefix>EventSubmit</logPrefix> 
    244248 
     249          <!-- Where the browser finds css and other resources -->     
     250          <browserResourceRoot>http://localhost:8080/eventsubmitrsrc</browserResourceRoot> 
     251           
     252          <!-- Where the server finds xsl etc -->     
    245253          <appRoot>http://localhost:8080/eventsubmitrsrc</appRoot> 
    246254 
    …… 
    275283          <logPrefix>PubEvents</logPrefix> 
    276284 
     285          <!-- Where the browser finds css and other resources -->     
     286          <browserResourceRoot>http://localhost:8080/calrsrc</browserResourceRoot> 
     287           
     288          <!-- Where the server finds xsl etc -->     
    277289          <appRoot>http://localhost:8080/calrsrc</appRoot> 
    278290 
    …… 
    311323          <logPrefix>Feeder</logPrefix> 
    312324 
     325          <!-- Where the browser finds css and other resources -->     
     326          <browserResourceRoot>http://localhost:8080/calfeedrsrc</browserResourceRoot> 
     327           
     328          <!-- Where the server finds xsl etc -->     
    313329          <appRoot>http://localhost:8080/calfeedrsrc</appRoot> 
    314330 
    …… 
    345361          <logPrefix>SoEDept</logPrefix> 
    346362 
     363          <!-- Where the browser finds css and other resources -->     
     364          <browserResourceRoot>http://localhost:8080/calrsrc</browserResourceRoot> 
     365           
     366          <!-- Where the server finds xsl etc -->     
    347367          <appRoot>http://localhost:8080/calrsrc</appRoot> 
    348368 
    …… 
    376396          <logPrefix>PersonalCalendar</logPrefix> 
    377397 
     398          <!-- Where the browser finds css and other resources -->     
     399          <browserResourceRoot>http://localhost:8080/ucalrsrc</browserResourceRoot> 
     400           
     401          <!-- Where the server finds xsl etc -->     
    378402          <appRoot>http://localhost:8080/ucalrsrc</appRoot> 
    379403 

  • trunk/config/bwbuild/oracle10g/sysevents.properties

    r2439 r2695  
    66# use the following property to configure the default connector 
    77java.naming.provider.url = tcp://localhost:61616?trace=true 
     8 
     9// Allows us to handle container differences 
     10org.bedework.connection.factory.name=jms/BedeworkConnectionFactory 
    811 
    912# use the following property to specify the JNDI name the connection factory 

  • trunk/deployment/dumprestore/shellscr/build.xml

    r2432 r2695  
    4343 
    4444  <target name="build.configured" depends="init" > 
    45     <!-- =============================================================== 
    46          Libraries for this application 
    47          =============================================================== --> 
    48  
    49     <!-- Extra resources --> 
    5045    <property name="app.temp.home" 
    5146              location="${org.bedework.temp.shellscr.home}/bldtemp/${propval.app.zip.name}" /> 
    5247    <mkdir dir="${app.temp.home}"/> 
    53     <mkdir dir="${app.temp.home}/resources"/> 
    54     <echo file="${app.temp.home}/resources/hibernate.properties"> 
    55 hibernate.query.substitutions true 'T', false 'F', yes 'Y', no 'N' 
    56 hibernate.dialect=${org.bedework.global.hibernate.dialect} 
    57 hibernate.connection.driver_class=${org.bedework.global.jdbcdriver} 
    58 hibernate.connection.username=${org.bedework.global.jdbcid} 
    59 hibernate.connection.password=${org.bedework.global.jdbcpw} 
    60 hibernate.connection.url=${org.bedework.global.jdbcurl} 
    61 hibernate.bytecode.use_reflection_optimizer=false 
    62 hibernate.cache.use_second_level_cache=false 
    63 # 
    64 # Here for better debugging 
    65 # 
    66 hibernate.jdbc.batch_size=0 
    67     </echo> 
    6848 
    6949    <mkdir dir="${app.temp.home}/data"/> 
    7050    <copy todir="${app.temp.home}/data" file="${app.sou.dir}/resources/initbedework.xml" /> 
    7151 
    72     <fileset id="org.bedework.extra.resources" dir="${app.temp.home}/resources" /> 
    7352    <fileset id="org.bedework.shellscr.data" dir="${app.temp.home}/data" /> 
    7453 

  • trunk/deployment/indexer/shellscr/build.xml

    r2432 r2695  
    4444  <target name="build.configured" depends="init" > 
    4545    <!-- =============================================================== 
    46          Libraries for this application 
    47          =============================================================== --> 
    48  
    49     <!-- Extra resources --> 
    50     <property name="app.temp.home" 
    51               location="${org.bedework.temp.shellscr.home}/bldtemp/${propval.app.zip.name}" /> 
    52     <mkdir dir="${app.temp.home}"/> 
    53     <mkdir dir="${app.temp.home}/resources"/> 
    54     <echo file="${app.temp.home}/resources/hibernate.properties"> 
    55 hibernate.query.substitutions true 'T', false 'F', yes 'Y', no 'N' 
    56 hibernate.dialect=${org.bedework.global.hibernate.dialect} 
    57 hibernate.connection.driver_class=${org.bedework.global.jdbcdriver} 
    58 hibernate.connection.username=${org.bedework.global.jdbcid} 
    59 hibernate.connection.password=${org.bedework.global.jdbcpw} 
    60 hibernate.connection.url=${org.bedework.global.jdbcurl} 
    61 hibernate.bytecode.use_reflection_optimizer=false 
    62 hibernate.cache.use_second_level_cache=false 
    63 # 
    64 # Here for better debugging 
    65 # 
    66 hibernate.jdbc.batch_size=0 
    67     </echo> 
    68  
    69     <mkdir dir="${app.temp.home}/data"/> 
    70  
    71     <fileset id="org.bedework.extra.resources" dir="${app.temp.home}/resources" /> 
    72     <fileset id="org.bedework.shellscr.data" dir="${app.temp.home}/data" /> 
    73  
    74     <!-- =============================================================== 
    7546         Build the shell script 
    7647         =============================================================== --> 

  • trunk/deployment/inoutsched/shellscr/build.xml

    r2432 r2695  
    4444  <target name="build.configured" depends="init" > 
    4545    <!-- =============================================================== 
    46          Libraries for this application 
    47          =============================================================== --> 
    48  
    49     <!-- Extra resources --> 
    50     <property name="app.temp.home" 
    51               location="${org.bedework.temp.shellscr.home}/bldtemp/${propval.app.zip.name}" /> 
    52     <mkdir dir="${app.temp.home}"/> 
    53     <mkdir dir="${app.temp.home}/resources"/> 
    54     <echo file="${app.temp.home}/resources/hibernate.properties"> 
    55 hibernate.query.substitutions true 'T', false 'F', yes 'Y', no 'N' 
    56 hibernate.dialect=${org.bedework.global.hibernate.dialect} 
    57 hibernate.connection.driver_class=${org.bedework.global.jdbcdriver} 
    58 hibernate.connection.username=${org.bedework.global.jdbcid} 
    59 hibernate.connection.password=${org.bedework.global.jdbcpw} 
    60 hibernate.connection.url=${org.bedework.global.jdbcurl} 
    61 hibernate.bytecode.use_reflection_optimizer=false 
    62 hibernate.cache.use_second_level_cache=false 
    63 # 
    64 # Here for better debugging 
    65 # 
    66 hibernate.jdbc.batch_size=0 
    67     </echo> 
    68  
    69     <mkdir dir="${app.temp.home}/data"/> 
    70  
    71     <fileset id="org.bedework.extra.resources" dir="${app.temp.home}/resources" /> 
    72     <fileset id="org.bedework.shellscr.data" dir="${app.temp.home}/data" /> 
    73  
    74     <!-- =============================================================== 
    7546         Build the shell script 
    7647         =============================================================== --> 

  • trunk/deployment/sysevlog/shellscr/build.xml

    r2432 r2695  
    4444  <target name="build.configured" depends="init" > 
    4545    <!-- =============================================================== 
    46          Libraries for this application 
    47          =============================================================== --> 
    48  
    49     <!-- Extra resources --> 
    50     <property name="app.temp.home" 
    51               location="${org.bedework.temp.shellscr.home}/bldtemp/${propval.app.zip.name}" /> 
    52     <mkdir dir="${app.temp.home}"/> 
    53     <mkdir dir="${app.temp.home}/resources"/> 
    54     <echo file="${app.temp.home}/resources/hibernate.properties"> 
    55 hibernate.query.substitutions true 'T', false 'F', yes 'Y', no 'N' 
    56 hibernate.dialect=${org.bedework.global.hibernate.dialect} 
    57 hibernate.connection.driver_class=${org.bedework.global.jdbcdriver} 
    58 hibernate.connection.username=${org.bedework.global.jdbcid} 
    59 hibernate.connection.password=${org.bedework.global.jdbcpw} 
    60 hibernate.connection.url=${org.bedework.global.jdbcurl} 
    61 hibernate.bytecode.use_reflection_optimizer=false 
    62 hibernate.cache.use_second_level_cache=false 
    63 # 
    64 # Here for better debugging 
    65 # 
    66 hibernate.jdbc.batch_size=0 
    67     </echo> 
    68  
    69     <mkdir dir="${app.temp.home}/data"/> 
    70  
    71     <fileset id="org.bedework.extra.resources" dir="${app.temp.home}/resources" /> 
    72     <fileset id="org.bedework.shellscr.data" dir="${app.temp.home}/data" /> 
    73  
    74     <!-- =============================================================== 
    7546         Build the shell script 
    7647         =============================================================== --> 

  • trunk/deployment/testsuite/shellscr/build.xml

    r2432 r2695  
    4343 
    4444  <target name="build.configured" depends="init" > 
    45     <!-- Extra resources --> 
    46     <property name="app.temp.home" 
    47               location="${org.bedework.temp.shellscr.home}/bldtemp/${propval.app.zip.name}" /> 
    48     <mkdir dir="${app.temp.home}"/> 
    49     <mkdir dir="${app.temp.home}/resources"/> 
    50     <echo file="${app.temp.home}/resources/hibernate.properties"> 
    51 hibernate.query.substitutions true 'T', false 'F', yes 'Y', no 'N' 
    52 hibernate.dialect=${org.bedework.global.hibernate.dialect} 
    53 hibernate.connection.driver_class=${org.bedework.global.jdbcdriver} 
    54 hibernate.connection.username=${org.bedework.global.jdbcid} 
    55 hibernate.connection.password=${org.bedework.global.jdbcpw} 
    56 hibernate.connection.url=${org.bedework.global.jdbcurl} 
    57 hibernate.bytecode.use_reflection_optimizer=false 
    58 hibernate.cache.use_second_level_cache=false 
    59 # 
    60 # Here for better debugging 
    61 # 
    62 hibernate.jdbc.batch_size=0 
    63     </echo> 
    64  
    65     <fileset id="org.bedework.extra.resources" dir="${app.temp.home}/resources" /> 
    66  
    67     <fileset id="org.bedework.shellscr.data" dir="${org.bedework.empty.dir}" > 
    68     </fileset> 
    69  
    7045    <!-- =============================================================== 
    7146         Build the shell script