[jboss-cvs] jboss-seam/examples/wiki ...
Christian Bauer
christian at hibernate.org
Tue Dec 18 23:29:29 EST 2007
User: cbauer
Date: 07/12/18 23:29:29
Modified: examples/wiki Wiki.iml Wiki.ipr README.txt
build.properties build.xml
Log:
Major rewrite of the most of the application
Revision Changes Path
1.18 +1 -6 jboss-seam/examples/wiki/Wiki.iml
(In the diff below, changes in quantity of whitespace are not shown.)
Index: Wiki.iml
===================================================================
RCS file: /cvsroot/jboss/jboss-seam/examples/wiki/Wiki.iml,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -b -r1.17 -r1.18
--- Wiki.iml 14 Nov 2007 10:19:43 -0000 1.17
+++ Wiki.iml 19 Dec 2007 04:29:29 -0000 1.18
@@ -1,20 +1,15 @@
<?xml version="1.0" encoding="UTF-8"?>
<module relativePaths="true" type="JAVA_MODULE" version="4">
- <component name="FacetManager">
- <facet type="jsf" name="JSF">
- <configuration />
- </facet>
- </component>
<component name="ModuleRootManager" />
<component name="NewModuleRootManager" inherit-compiler-output="false">
<output url="file://$MODULE_DIR$/build/classes" />
<exclude-output />
- <exploded url="file://$MODULE_DIR$/build/exploded/wiki.war" />
<exclude-exploded />
<output-test url="file://$MODULE_DIR$/build/testclasses" />
<content url="file://$MODULE_DIR$">
<sourceFolder url="file://$MODULE_DIR$/src/main" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/test" isTestSource="true" />
+ <excludeFolder url="file://$MODULE_DIR$/build" />
</content>
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
1.17 +22 -1 jboss-seam/examples/wiki/Wiki.ipr
(In the diff below, changes in quantity of whitespace are not shown.)
Index: Wiki.ipr
===================================================================
RCS file: /cvsroot/jboss/jboss-seam/examples/wiki/Wiki.ipr,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -b -r1.16 -r1.17
--- Wiki.ipr 14 Nov 2007 10:19:43 -0000 1.16
+++ Wiki.ipr 19 Dec 2007 04:29:29 -0000 1.17
@@ -11,11 +11,12 @@
<property name="profile" value="dev" />
</properties>
<executeOn event="afterCompilation" target="deploy" />
+ <executeOn event="beforeRun" target="configuretests" runConfigurationType="TestNG" runConfigurationName="AllTests" />
<executeOn event="beforeRun" target="configuretests" runConfigurationName="LoginTest" />
<executeOn event="beforeRun" target="configuretests" runConfigurationName="Unnamed" />
<executeOn event="beforeRun" target="configuretests" runConfigurationName="AllTests" />
+ <executeOn event="beforeRun" target="configuretests" runConfigurationType="TestNG" runConfigurationName="DocumentHistoryTests.updateDocumentCheckRevisions" />
<executeOn event="beforeRun" target="configuretests" runConfigurationName="" />
- <executeOn event="beforeRun" target="configuretests" runConfigurationType="TestNG" runConfigurationName="AllTests" />
</buildFile>
</component>
<component name="BuildJarProjectSettings">
@@ -49,6 +50,9 @@
<component name="CompilerConfiguration">
<option name="DEFAULT_COMPILER" value="Javac" />
<option name="DEPLOY_AFTER_MAKE" value="0" />
+ <excludeFromCompile>
+ <directory url="file://$PROJECT_DIR$/src/main/org/jboss/seam/wiki/plugin/blogdirectory" includeSubdirectories="true" />
+ </excludeFromCompile>
<resourceExtensions>
<entry name=".+\.(properties|xml|html|dtd|tld)" />
<entry name=".+\.(gif|png|jpeg|jpg)" />
@@ -1133,6 +1137,21 @@
<option name="OPEN_IN_BROWSER" value="false" />
<option name="OUTPUT_DIRECTORY" />
</component>
+ <component name="FacetAutodetectingManager">
+ <autodetection-disabled>
+ <facet-type id="jpa">
+ <modules>
+ <module name="Wiki">
+ <files>
+ <file url="file://$PROJECT_DIR$/src/etc/META-INF/persistence-dev-war.xml" />
+ <file url="file://$PROJECT_DIR$/src/etc/META-INF/persistence-prod-war.xml" />
+ <file url="file://$PROJECT_DIR$/src/etc/META-INF/persistence-test-war.xml" />
+ </files>
+ </module>
+ </modules>
+ </facet-type>
+ </autodetection-disabled>
+ </component>
<component name="IdProvider" IDEtalkID="DABC613C2C2ECC9BA342B78949704CE0" />
<component name="InspectionProjectProfileManager">
<option name="PROJECT_PROFILE" value="Project Default" />
@@ -1182,6 +1201,7 @@
<option name="m_ignoreTestCases" value="true" />
<option name="m_ignoreIgnoreParameter" value="true" />
</inspection_tool>
+ <inspection_tool class="EjbQlInspection" level="ERROR" enabled="false" />
</profile>
</profiles>
</component>
@@ -1373,6 +1393,7 @@
<mapping directory="" vcs="CVS" />
</component>
<component name="VssVcs" />
+ <component name="WebServicesPlugin" addRequiredLibraries="true" />
<component name="com.intellij.jsf.UserDefinedFacesConfigs">
<option name="USER_DEFINED_CONFIGS">
<value>
1.17 +2 -1 jboss-seam/examples/wiki/README.txt
(In the diff below, changes in quantity of whitespace are not shown.)
Index: README.txt
===================================================================
RCS file: /cvsroot/jboss/jboss-seam/examples/wiki/README.txt,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -b -r1.16 -r1.17
--- README.txt 13 Nov 2007 13:04:18 -0000 1.16
+++ README.txt 19 Dec 2007 04:29:29 -0000 1.17
@@ -33,7 +33,7 @@
- Install JBoss Application Server 4.2.2 GA
-- Upgrade/downgrade the Hibernate libraries bundled with JBoss 4.2.1 to the libraries bundled
+- Upgrade/downgrade the Hibernate libraries bundled with JBoss AS to the libraries bundled
with this application. Follow the steps outlined above (edit build.properties, call
'ant upgradehibernate') or copy them manually.
@@ -56,6 +56,7 @@
- Start (if you haven't done so already) JBoss AS and access http://localhost:8080/wiki (or the
baseUrl you specified on data import)
+- Login as admin/admin and update the Lucene index in the 'Administration' screen
NOTE: The lucene index directory is named "lacewikiIndex" and located in the current directory. This
is the current directory from which you started the application server! If you want to change this setting,
1.20 +1 -0 jboss-seam/examples/wiki/build.properties
(In the diff below, changes in quantity of whitespace are not shown.)
Index: build.properties
===================================================================
RCS file: /cvsroot/jboss/jboss-seam/examples/wiki/build.properties,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -b -r1.19 -r1.20
--- build.properties 13 Nov 2007 13:04:18 -0000 1.19
+++ build.properties 19 Dec 2007 04:29:29 -0000 1.20
@@ -6,3 +6,4 @@
javac.nowarn on
testng.jvmargs
#testng.jvmargs = -Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=n,address=5005
+dbunit.import true
\ No newline at end of file
1.46 +42 -16 jboss-seam/examples/wiki/build.xml
(In the diff below, changes in quantity of whitespace are not shown.)
Index: build.xml
===================================================================
RCS file: /cvsroot/jboss/jboss-seam/examples/wiki/build.xml,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -b -r1.45 -r1.46
--- build.xml 7 Dec 2007 14:09:22 -0000 1.45
+++ build.xml 19 Dec 2007 04:29:29 -0000 1.46
@@ -61,7 +61,7 @@
<pathelement path="${testclasses.dir}"/>
<pathelement path="${embedded-jboss.dir}"/>
- <!-- JBoss Embedded, without hibernate -->
+ <!-- JBoss Embedded, without Hibernate -->
<fileset dir="${global.lib.dir}/test">
<include name="jboss-embedded-all.jar" />
<include name="thirdparty-all.jar" />
@@ -69,25 +69,14 @@
<fileset dir="${global.lib.dir}">
<include name="*.jar" />
- <!-- Horrible hack around jbossembedded -->
- <exclude name="jboss-container.jar" />
- <!-- Use local hibernate -->
+ <!-- Don't use that Hibernate either... -->
<exclude name="hibernate*.jar"/>
- <!-- Don't need all seam jars -->
- <exclude name="jboss-seam.jar" />
</fileset>
<fileset dir="${local.lib.dir}">
+ <!-- This has the Hibernate we want -->
<include name="*.jar" />
</fileset>
- <!-- YOU NEED THIS FILESET AND IT CAN ONLY CONTAIN jboss-seam.jar AND NOTHING ELSE!
- OTHERWISE THE EMBEDDABLE CONTAINER WON'T SCAN IT FOR EJBs (EjbTransaction, TimserServiceDispatcher, etc.)
- IN THE jboss-seam.jar.
- -->
- <fileset dir="${global.lib.dir}">
- <include name="jboss-seam.jar" />
- </fileset>
-
<!-- Add EMMA to the classpath for coverage support -->
<pathelement location="${seam.dir}/extras/emma/emma.jar" />
<pathelement location="${seam.dir}/extras/emma/emma_ant.jar" />
@@ -120,6 +109,12 @@
<taskdef name="hibernatetool"
classname="org.hibernate.tool.ant.HibernateToolTask"
classpathref="tools.classpath"/>
+
+ <!-- Import test data if we are in 'dev' profile -->
+ <condition property="importdata">
+ <equals arg1="${profile}" arg2="dev"/>
+ </condition>
+
</target>
<target name="clean" description="Cleans up all build artifacts">
@@ -159,6 +154,7 @@
deprecation="${javac.deprecation}"
nowarn="${javac.nowarn}">
<src path="${src.java.dir}"/>
+ <exclude name="org/jboss/seam/wiki/plugin/blogdirectory/**"/>
</javac>
<!-- Copy resources (mapping files, properties, etc.) to classes -->
@@ -177,16 +173,18 @@
<fileset dir="${classes.dir}/org/jboss/seam/wiki/core/model">
<include name="**/*.class"/>
</fileset>
+ <!-- TODO
<fileset dir="${classes.dir}/org/jboss/seam/wiki/plugin/forum">
<include name="ForumTopic.class"/>
</fileset>
+ -->
</instrument>
</target>
<!-- ################## EXPLODE ####################### -->
- <target name="explodewar" depends="explodehotdeploy, exploderesources"
+ <target name="explodewar" depends="explodehotdeploy, exploderesources, copydatasets"
description="Creates a hot-redeployable exploded WAR directory">
</target>
@@ -308,6 +306,11 @@
file="${src.etc.dir}/META-INF/persistence-${profile}-war.xml"
overwrite="true">
</copy>
+ <copy tofile="${exploded.war.dir}/WEB-INF/classes/META-INF/components.xml"
+ file="${src.etc.dir}/META-INF/components-${profile}.xml"
+ overwrite="true">
+ </copy>
+
<!--
<replace file="${exploded.war.dir}/WEB-INF/classes/META-INF/persistence.xml"
token="@LuceneIndexDir@" value="${lucene.indexDir}"/>
@@ -315,6 +318,21 @@
</target>
+ <target name="copydatasets" if="importdata">
+ <mkdir dir="${exploded.war.dir}/WEB-INF/classes/META-INF/testdata"/>
+ <copy todir="${exploded.war.dir}/WEB-INF/classes/META-INF/testdata" flatten="true">
+ <fileset dir="${src.test.dir}">
+ <include name="**/*.dbunit.xml"/>
+ </fileset>
+ </copy>
+ <mkdir dir="${exploded.war.dir}/WEB-INF/classes/META-INF/testbinaries"/>
+ <copy todir="${exploded.war.dir}/WEB-INF/classes/META-INF/testbinaries" flatten="true">
+ <fileset dir="${basedir}/testbinaries">
+ <include name="**/*"/>
+ </fileset>
+ </copy>
+ </target>
+
<!-- ################## DEPLOYMENT ####################### -->
<target name="hotdeploy" depends="explodehotdeploy"
@@ -487,6 +505,14 @@
file="${src.etc.dir}/wiki-test-ds.xml"
overwrite="true"/>
+ <!-- ######## Test binaries ######## -->
+ <mkdir dir="${testclasses.dir}/META-INF/testbinaries"/>
+ <copy todir="${testclasses.dir}/META-INF/testbinaries">
+ <fileset dir="${basedir}/testbinaries">
+ <include name="**/*"/>
+ </fileset>
+ </copy>
+
<!-- ######## Test output ######## -->
<delete dir="${test.output.dir}"/>
<mkdir dir="${test.output.dir}"/>
More information about the jboss-cvs-commits
mailing list