JBoss Tools SVN: r5105 - trunk/as/docs/resources/styles/en.
by jbosstools-commits@lists.jboss.org
Author: smukhina
Date: 2007-11-27 07:26:06 -0500 (Tue, 27 Nov 2007)
New Revision: 5105
Modified:
trunk/as/docs/resources/styles/en/html.xsl
trunk/as/docs/resources/styles/en/html_chunk.xsl
Log:
http://jira.jboss.com/jira/browse/RHDS-303
docbook resources are taken from local folder now
Modified: trunk/as/docs/resources/styles/en/html.xsl
===================================================================
--- trunk/as/docs/resources/styles/en/html.xsl 2007-11-27 12:24:29 UTC (rev 5104)
+++ trunk/as/docs/resources/styles/en/html.xsl 2007-11-27 12:26:06 UTC (rev 5105)
@@ -15,7 +15,7 @@
-->
<!DOCTYPE xsl:stylesheet [
- <!ENTITY db_xsl_path "../support/docbook-xsl">
+ <!ENTITY db_xsl_path "../../support/docbook-xsl">
]>
<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
@@ -23,7 +23,7 @@
xmlns="http://www.w3.org/TR/xhtml1/transitional"
exclude-result-prefixes="#default">
-<xsl:import href="http://docbook.sourceforge.net/release/xsl/current/html/docbook.xsl"/>
+<xsl:import href="&db_xsl_path;/html/docbook.xsl"/>
<xsl:include href="./collapsing-navigation.xsl"></xsl:include>
<xsl:include href="./highlight.xsl"></xsl:include>
@@ -49,8 +49,8 @@
book toc
</xsl:param>
- <!-- Show only Sections up to level 3 in the TOCs -->
- <xsl:param name="toc.section.depth">3</xsl:param>
+ <!-- Show only Sections up to level 5 in the TOCs -->
+ <xsl:param name="toc.section.depth">5</xsl:param>
<!--###################################################
Labels
Modified: trunk/as/docs/resources/styles/en/html_chunk.xsl
===================================================================
--- trunk/as/docs/resources/styles/en/html_chunk.xsl 2007-11-27 12:24:29 UTC (rev 5104)
+++ trunk/as/docs/resources/styles/en/html_chunk.xsl 2007-11-27 12:26:06 UTC (rev 5105)
@@ -23,10 +23,8 @@
xmlns="http://www.w3.org/TR/xhtml1/transitional"
exclude-result-prefixes="#default">
-<!-- <xsl:import href="&db_xsl_path;/html/chunk.xsl"/> -->
+<xsl:import href="&db_xsl_path;/html/chunk.xsl"/>
-<xsl:import href="http://docbook.sourceforge.net/release/xsl/current/html/chunk.xsl"/>
-
<xsl:include href="./collapsing-navigation.xsl"></xsl:include>
<xsl:include href="./highlight.xsl"></xsl:include>
@@ -54,8 +52,8 @@
book toc
</xsl:param>
- <!-- Show only Sections up to level 3 in the TOCs -->
- <xsl:param name="toc.section.depth">3</xsl:param>
+ <!-- Show only Sections up to level 5 in the TOCs -->
+ <xsl:param name="toc.section.depth">5</xsl:param>
<!--###################################################
Labels
17 years, 2 months
JBoss Tools SVN: r5102 - trunk/jbpm/docs/resources/styles/en.
by jbosstools-commits@lists.jboss.org
Author: smukhina
Date: 2007-11-27 07:20:33 -0500 (Tue, 27 Nov 2007)
New Revision: 5102
Modified:
trunk/jbpm/docs/resources/styles/en/html.xsl
trunk/jbpm/docs/resources/styles/en/html_chunk.xsl
Log:
http://jira.jboss.com/jira/browse/RHDS-303
docbook resources are taken from local folder now
Modified: trunk/jbpm/docs/resources/styles/en/html.xsl
===================================================================
--- trunk/jbpm/docs/resources/styles/en/html.xsl 2007-11-27 08:40:33 UTC (rev 5101)
+++ trunk/jbpm/docs/resources/styles/en/html.xsl 2007-11-27 12:20:33 UTC (rev 5102)
@@ -15,7 +15,7 @@
-->
<!DOCTYPE xsl:stylesheet [
- <!ENTITY db_xsl_path "../support/docbook-xsl">
+ <!ENTITY db_xsl_path "../../support/docbook-xsl">
]>
<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
@@ -23,7 +23,7 @@
xmlns="http://www.w3.org/TR/xhtml1/transitional"
exclude-result-prefixes="#default">
-<xsl:import href="http://docbook.sourceforge.net/release/xsl/current/html/docbook.xsl"/>
+<xsl:import href="&db_xsl_path;/html/docbook.xsl"/>
<xsl:include href="./collapsing-navigation.xsl"></xsl:include>
<xsl:include href="./highlight.xsl"></xsl:include>
Modified: trunk/jbpm/docs/resources/styles/en/html_chunk.xsl
===================================================================
--- trunk/jbpm/docs/resources/styles/en/html_chunk.xsl 2007-11-27 08:40:33 UTC (rev 5101)
+++ trunk/jbpm/docs/resources/styles/en/html_chunk.xsl 2007-11-27 12:20:33 UTC (rev 5102)
@@ -23,10 +23,8 @@
xmlns="http://www.w3.org/TR/xhtml1/transitional"
exclude-result-prefixes="#default">
-<!-- <xsl:import href="&db_xsl_path;/html/chunk.xsl"/> -->
+<xsl:import href="&db_xsl_path;/html/chunk.xsl"/>
-<xsl:import href="http://docbook.sourceforge.net/release/xsl/current/html/chunk.xsl"/>
-
<xsl:include href="./collapsing-navigation.xsl"></xsl:include>
<xsl:include href="./highlight.xsl"></xsl:include>
17 years, 2 months
JBoss Tools SVN: r5101 - trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/project/facet.
by jbosstools-commits@lists.jboss.org
Author: dgolovin
Date: 2007-11-27 03:40:33 -0500 (Tue, 27 Nov 2007)
New Revision: 5101
Modified:
trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/project/facet/Seam2FacetInstallDelegate.java
Log:
http://jira.jboss.com/jira/browse/JBIDE-1367
ds file name pattern is changedfor file in test project to <<seamWebProjectname>>-test-ds.xml
Modified: trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/project/facet/Seam2FacetInstallDelegate.java
===================================================================
--- trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/project/facet/Seam2FacetInstallDelegate.java 2007-11-27 02:44:06 UTC (rev 5100)
+++ trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/project/facet/Seam2FacetInstallDelegate.java 2007-11-27 08:40:33 UTC (rev 5101)
@@ -671,7 +671,7 @@
AntCopyUtils.copyFileToFile(
dataSourceFile,
- new File(testProjectDir,"test-src/META-INF/"+seamWebProject.getName()+"-ds.xml"), //$NON-NLS-1$
+ new File(testProjectDir,"test-src/META-INF/"+seamWebProject.getName()+"-test-ds.xml"), //$NON-NLS-1$
f, true);
AntCopyUtils.copyFileToFolder(
17 years, 2 months
JBoss Tools SVN: r5100 - trunk/seam/plugins/org.jboss.tools.seam.core/templates/test/test-src/META-INF.
by jbosstools-commits@lists.jboss.org
Author: dgolovin
Date: 2007-11-26 21:44:06 -0500 (Mon, 26 Nov 2007)
New Revision: 5100
Modified:
trunk/seam/plugins/org.jboss.tools.seam.core/templates/test/test-src/META-INF/jboss-beans.xml
Log:
http://jira.jboss.com/jira/browse/JBIDE-1367
fix test errors for Seam1 EAR projects.
datasource bean "<<projectName>>Datasource" declaration added
Modified: trunk/seam/plugins/org.jboss.tools.seam.core/templates/test/test-src/META-INF/jboss-beans.xml
===================================================================
--- trunk/seam/plugins/org.jboss.tools.seam.core/templates/test/test-src/META-INF/jboss-beans.xml 2007-11-27 00:56:02 UTC (rev 5099)
+++ trunk/seam/plugins/org.jboss.tools.seam.core/templates/test/test-src/META-INF/jboss-beans.xml 2007-11-27 02:44:06 UTC (rev 5100)
@@ -17,4 +17,11 @@
<property name="cachedConnectionManager"><inject bean="CachedConnectionManager"/></property>
<property name="initialContextProperties"><inject bean="InitialContextProperties"/></property>
</bean>
+
+ <bean name="@projectName@Datasource" class="java.lang.Object">
+ <constructor factoryMethod="getDatasource">
+ <factory bean="@projectName@TestDatasourceBootstrap"/>
+ </constructor>
+ </bean>
+
</deployment>
\ No newline at end of file
17 years, 2 months
JBoss Tools SVN: r5099 - in trunk/seam/plugins/org.jboss.tools.seam.core: templates/test/test-src/META-INF and 1 other directory.
by jbosstools-commits@lists.jboss.org
Author: dgolovin
Date: 2007-11-26 19:56:02 -0500 (Mon, 26 Nov 2007)
New Revision: 5099
Added:
trunk/seam/plugins/org.jboss.tools.seam.core/templates/test/test-src/META-INF/jboss-beans.xml
Modified:
trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/project/facet/SeamFacetInstallDelegate.java
Log:
http://jira.jboss.com/jira/browse/JBIDE-1367
changes for seam 1.2.X projects
persistence.xml removed from test project
jboss-beans.xml added to test template to have right source name
Modified: trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/project/facet/SeamFacetInstallDelegate.java
===================================================================
--- trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/project/facet/SeamFacetInstallDelegate.java 2007-11-27 00:50:02 UTC (rev 5098)
+++ trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/project/facet/SeamFacetInstallDelegate.java 2007-11-27 00:56:02 UTC (rev 5099)
@@ -631,17 +631,7 @@
new File(seamRuntime.getHomeDir(),"embedded-ejb/conf"), //$NON-NLS-1$
embededEjbDir,
new AntCopyUtils.FileSetFileFilter(excludeCvsSvn));
-
- AntCopyUtils.copyFileToFile(
- persistenceFile,
- new File(testProjectDir,"test-src/META-INF/persistence.xml"), //$NON-NLS-1$
- new FilterSetCollection(filterSet), true);
-
- AntCopyUtils.copyFileToFolder(
- jbossBeansFile,
- new File(testProjectDir,"test-src/META-INF"), //$NON-NLS-1$
- new FilterSetCollection(filterSet), true);
-
+
AntCopyUtils.copyFiles(
new File(seamRuntime.getHomeDir(),"lib"), //$NON-NLS-1$
testLibDir,
Added: trunk/seam/plugins/org.jboss.tools.seam.core/templates/test/test-src/META-INF/jboss-beans.xml
===================================================================
--- trunk/seam/plugins/org.jboss.tools.seam.core/templates/test/test-src/META-INF/jboss-beans.xml (rev 0)
+++ trunk/seam/plugins/org.jboss.tools.seam.core/templates/test/test-src/META-INF/jboss-beans.xml 2007-11-27 00:56:02 UTC (rev 5099)
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<deployment xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="urn:jboss:bean-deployer bean-deployer_1_0.xsd"
+ xmlns="urn:jboss:bean-deployer">
+
+ <bean name="@projectName@TestDatasourceBootstrap" class="org.jboss.resource.adapter.jdbc.local.LocalTxDataSource">
+ <property name="driverClass">org.hsqldb.jdbcDriver</property>
+ <property name="connectionURL">jdbc:hsqldb:.</property>
+ <property name="userName"><value class="java.lang.String">sa</value></property>
+ <property name="password"><value class="java.lang.String"></value></property>
+ <property name="jndiName">java:/@projectName@Datasource</property>
+ <property name="minSize">0</property>
+ <property name="maxSize">10</property>
+ <property name="blockingTimeout">1000</property>
+ <property name="idleTimeout">100000</property>
+ <property name="transactionManager"><inject bean="TransactionManager"/></property>
+ <property name="cachedConnectionManager"><inject bean="CachedConnectionManager"/></property>
+ <property name="initialContextProperties"><inject bean="InitialContextProperties"/></property>
+ </bean>
+</deployment>
\ No newline at end of file
Property changes on: trunk/seam/plugins/org.jboss.tools.seam.core/templates/test/test-src/META-INF/jboss-beans.xml
___________________________________________________________________
Name: svn:mime-type
+ text/plain
17 years, 2 months
JBoss Tools SVN: r5097 - trunk/jbpm/docs/reference/en.
by jbosstools-commits@lists.jboss.org
Author: mculpepper(a)jboss.com
Date: 2007-11-26 17:39:25 -0500 (Mon, 26 Nov 2007)
New Revision: 5097
Modified:
trunk/jbpm/docs/reference/en/master.xml
Log:
introduction.xml was lower case, doesn't work in unix environments
Modified: trunk/jbpm/docs/reference/en/master.xml
===================================================================
--- trunk/jbpm/docs/reference/en/master.xml 2007-11-26 19:42:33 UTC (rev 5096)
+++ trunk/jbpm/docs/reference/en/master.xml 2007-11-26 22:39:25 UTC (rev 5097)
@@ -3,7 +3,7 @@
"../../resources/support/docbook-dtd/docbookx.dtd"
-[<!ENTITY introduction SYSTEM "modules/introduction.xml">
+[<!ENTITY introduction SYSTEM "modules/Introduction.xml">
<!ENTITY jboss_jbpm_runtime_installation SYSTEM "modules/jboss_jbpm_runtime_installation.xml">
<!ENTITY guided_tour_jboss_jbpmgpd SYSTEM "modules/guided_tour_jboss_jbpmgpd.xml">
<!ENTITY Test_Drive_Proc SYSTEM "modules/Test_Drive_Proc.xml">
17 years, 2 months
JBoss Tools SVN: r5096 - trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/project/facet.
by jbosstools-commits@lists.jboss.org
Author: dgolovin
Date: 2007-11-26 14:42:33 -0500 (Mon, 26 Nov 2007)
New Revision: 5096
Modified:
trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/project/facet/Seam2FacetInstallDelegate.java
Log:
http://jira.jboss.com/jira/browse/JBIDE-1367
changes for seam2
ds.xml into test-src/META-INF/<<project-name>>-ds.xml
add seam.properties to test-src
persistence.xml removed from tests project
Modified: trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/project/facet/Seam2FacetInstallDelegate.java
===================================================================
--- trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/project/facet/Seam2FacetInstallDelegate.java 2007-11-26 19:41:07 UTC (rev 5095)
+++ trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/project/facet/Seam2FacetInstallDelegate.java 2007-11-26 19:42:33 UTC (rev 5096)
@@ -338,11 +338,11 @@
viewFilterSetCollection, true);
// to fix seam2 tests for war deployment
- File srcModelMetaInf = new File(project.getLocation().append(modelSrcPath).toFile(),"META-INF");
- AntCopyUtils.copyFileToFile(
- dataSourceDsFile,
- new File(srcModelMetaInf,project.getName()+"-ds.xml"), //$NON-NLS-1$
- viewFilterSetCollection, true);
+// File srcModelMetaInf = new File(project.getLocation().append(modelSrcPath).toFile(),"META-INF");
+// AntCopyUtils.copyFileToFile(
+// dataSourceDsFile,
+// new File(srcModelMetaInf,project.getName()+"-ds.xml"), //$NON-NLS-1$
+// viewFilterSetCollection, true);
AntCopyUtils.copyFileToFile(
hibernateConsoleLaunchFile,
@@ -591,11 +591,15 @@
File testSrcDir = new File(testProjectDir,"test-src"); //$NON-NLS-1$
String seamGenResFolder = seamRuntime.getResourceTemplatesDir();
File persistenceFile = new File(seamGenResFolder ,"META-INF/persistence-" + (isWarConfiguration(model)?TEST_WAR_PROFILE:TEST_EAR_PROFILE) + ".xml"); //$NON-NLS-1$ //$NON-NLS-2$
+ File dataSourceFile = new File(seamGenResFolder, "datasource-ds.xml");
+ File seamPropertiesFile = new File(seamGenResFolder, "seam.properties");
//File jbossBeansFile = new File(seamGenResFolder ,"META-INF/jboss-beans.xml"); //$NON-NLS-1$
FilterSet filterSet = new FilterSet();
filterSet.addFilter("projectName", projectName); //$NON-NLS-1$
filterSet.addFilter("runtimeName", WtpUtils.getServerRuntimeName(seamWebProject)); //$NON-NLS-1$
filterSet.addFilter("webRootFolder",webRootVirtFolder.getUnderlyingFolder().getFullPath().removeFirstSegments(1).toString()); //$NON-NLS-1$
+
+ FilterSet jdbcFilterSet = SeamFacetFilterSetFactory.createJdbcFilterSet(model);
// TODO: why are these filters not shared!?
filterSet.addConfiguredFilterSet(SeamFacetFilterSetFactory.createHibernateDialectFilterSet(model));
@@ -655,27 +659,37 @@
new File(seamRuntime.getHomeDir(),"bootstrap"), //$NON-NLS-1$
embededEjbDir,
new AntCopyUtils.FileSetFileFilter(excludeCvsSvn), new FilterSetCollection(), true);
+
+// AntCopyUtils.copyFileToFile(
+// persistenceFile,
+// new File(testProjectDir,"test-src/META-INF/persistence.xml"), //$NON-NLS-1$
+// new FilterSetCollection(filterSet), true);
+ FilterSetCollection f = new FilterSetCollection();
+ f.addFilterSet(filterSet);
+ f.addFilterSet(jdbcFilterSet);
+
AntCopyUtils.copyFileToFile(
- persistenceFile,
- new File(testProjectDir,"test-src/META-INF/persistence.xml"), //$NON-NLS-1$
+ dataSourceFile,
+ new File(testProjectDir,"test-src/META-INF/"+seamWebProject.getName()+"-ds.xml"), //$NON-NLS-1$
+ f, true);
+
+ AntCopyUtils.copyFileToFolder(
+ seamPropertiesFile,
+ testSrcDir, //$NON-NLS-1$
new FilterSetCollection(filterSet), true);
- /*AntCopyUtils.copyFileToFolder(
- jbossBeansFile,
- new File(testProjectDir,"test-src/META-INF"), //$NON-NLS-1$
- new FilterSetCollection(filterSet), true);*/
-
AntCopyUtils.copyFiles(
new File(seamRuntime.getHomeDir(),"lib"), //$NON-NLS-1$
testLibDir,
new AntCopyUtils.FileSetFileFilter(includeLibs));
+
//seam2 has a lib/test
AntCopyUtils.copyFiles(
new File(seamRuntime.getHomeDir(),"lib/test"), //$NON-NLS-1$
testLibDir,
new AntCopyUtils.FileSetFileFilter(includeLibs));
-
+
createComponentsProperties(testSrcDir, "", true); //$NON-NLS-1$
}
17 years, 2 months