Skip to Content.
Sympa Menu

notify-dpml - r1786 - in trunk/main: depot depot/test depot/test/src depot/test/src/test depot/test/src/test/net depot/test/src/test/net/dpml depot/test/src/test/net/dpml/tools depot/test/src/test/net/dpml/tools/test depot/tools/src/main/net/dpml/tools/tasks lang/module/etc station/server/src/main/net/dpml/station/server

notify-dpml AT lists.ibiblio.org

Subject: DPML Notify

List archive

Chronological Thread  
  • From: mcconnell at BerliOS <mcconnell AT mail.berlios.de>
  • To: notify-dpml AT lists.ibiblio.org
  • Subject: r1786 - in trunk/main: depot depot/test depot/test/src depot/test/src/test depot/test/src/test/net depot/test/src/test/net/dpml depot/test/src/test/net/dpml/tools depot/test/src/test/net/dpml/tools/test depot/tools/src/main/net/dpml/tools/tasks lang/module/etc station/server/src/main/net/dpml/station/server
  • Date: Fri, 24 Nov 2006 14:40:30 +0100

Author: mcconnell
Date: 2006-11-24 14:40:29 +0100 (Fri, 24 Nov 2006)
New Revision: 1786

Added:
trunk/main/depot/test/
trunk/main/depot/test/src/
trunk/main/depot/test/src/test/
trunk/main/depot/test/src/test/net/
trunk/main/depot/test/src/test/net/dpml/
trunk/main/depot/test/src/test/net/dpml/tools/
trunk/main/depot/test/src/test/net/dpml/tools/test/
trunk/main/depot/test/src/test/net/dpml/tools/test/PropertiesTestCase.java
trunk/main/depot/test/test.properties
Modified:
trunk/main/depot/module.xml
trunk/main/depot/tools/src/main/net/dpml/tools/tasks/JUnitTestTask.java
trunk/main/lang/module/etc/module.xsd

trunk/main/station/server/src/main/net/dpml/station/server/StationServerPlugin.java
Log:
fix JRE1.4 issue with JMX and property resolver issue

Modified: trunk/main/depot/module.xml
===================================================================
--- trunk/main/depot/module.xml 2006-11-22 12:24:55 UTC (rev 1785)
+++ trunk/main/depot/module.xml 2006-11-24 13:40:29 UTC (rev 1786)
@@ -191,4 +191,24 @@
</dependencies>
</project>

+ <project name="dpml-depot-test" basedir="test">
+ <info title="DPML Java to HTML Converter">
+ <description>Depot Tests.</description>
+ </info>
+ <properties>
+ <property name="project.major.version" value="0"/>
+ <property name="project.minor.version" value="0"/>
+ <property name="project.micro.version" value="0"/>
+ </properties>
+ <dependencies>
+ <build>
+ <include ref="dpml/depot/dpml-tools-builder"/>
+ <include ref="ant/ant-junit"/>
+ </build>
+ <test>
+ <include ref="ant/ant-junit"/>
+ </test>
+ </dependencies>
+ </project>
+
</module>


Property changes on: trunk/main/depot/test
___________________________________________________________________
Name: svn:ignore
+ target


Added:
trunk/main/depot/test/src/test/net/dpml/tools/test/PropertiesTestCase.java
===================================================================
---
trunk/main/depot/test/src/test/net/dpml/tools/test/PropertiesTestCase.java
2006-11-22 12:24:55 UTC (rev 1785)
+++
trunk/main/depot/test/src/test/net/dpml/tools/test/PropertiesTestCase.java
2006-11-24 13:40:29 UTC (rev 1786)
@@ -0,0 +1,40 @@
+/*
+ * Copyright 2005 Stephen J. McConnell
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+ * implied.
+ *
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package net.dpml.tools.test;
+
+import junit.framework.TestCase;
+
+/**
+ * PropertiesTestCase.
+ *
+ * @author <a href="@PUBLISHER-URL@">@PUBLISHER-NAME@</a>
+ * @version @PROJECT-VERSION@
+ */
+public class PropertiesTestCase extends TestCase
+{
+ public void testTheTestProperties()
+ {
+ System.out.println( "${test.alpha}: " + System.getProperty(
"test.alpha" ) );
+ System.out.println( "${user.name}: " + System.getProperty(
"user.name" ) );
+ System.out.println( "${user.dir}: " + System.getProperty( "user.dir"
) );
+ System.out.println( "${project.test.dir}: " + System.getProperty(
"project.test.dir" ) );
+ System.out.println( "${test.dir}: " + System.getProperty( "test.dir"
) );
+ System.out.println( "${test.delta}: " + System.getProperty(
"test.delta" ) );
+ }
+}

Added: trunk/main/depot/test/test.properties
===================================================================
--- trunk/main/depot/test/test.properties 2006-11-22 12:24:55 UTC (rev
1785)
+++ trunk/main/depot/test/test.properties 2006-11-24 13:40:29 UTC (rev
1786)
@@ -0,0 +1,13 @@
+
+#
+# This is an example of a properties file that is used to assign
+# system properties to forked junit test jvm instances.
+#
+
+test.alpha=alpha
+test.beta=${user.name}
+test.gamma=${user.dir}
+test.dir=${project.test.dir}
+test.delta=${project.test.dir}${file.separator}${project.name}
+
+# eof

Modified:
trunk/main/depot/tools/src/main/net/dpml/tools/tasks/JUnitTestTask.java
===================================================================
--- trunk/main/depot/tools/src/main/net/dpml/tools/tasks/JUnitTestTask.java
2006-11-22 12:24:55 UTC (rev 1785)
+++ trunk/main/depot/tools/src/main/net/dpml/tools/tasks/JUnitTestTask.java
2006-11-24 13:40:29 UTC (rev 1786)
@@ -34,6 +34,7 @@
import net.dpml.tools.Context;

import net.dpml.transit.Transit;
+import net.dpml.util.PropertyResolver;

import org.apache.tools.ant.BuildException;
import org.apache.tools.ant.Project;
@@ -352,7 +353,7 @@
junit.addConfiguredSysproperty( security );
}

- setupTestProperties( junit, project );
+ setupTestProperties( junit, project, working );

final File logProperties = new File( working, "logging.properties" );
if( logProperties.exists() )
@@ -416,7 +417,7 @@
junit.execute();
}

- private void setupTestProperties( JUnitTask junit, Project project )
+ private void setupTestProperties( JUnitTask junit, Project project, File
working )
{
File base = project.getBaseDir();
final File properties = new File( base, "test.properties" );
@@ -425,9 +426,11 @@
Properties props = new Properties();
try
{
+ props.setProperty( "project.test.dir",
working.getCanonicalPath() );
InputStream input = new FileInputStream( properties );
props.load( input );
Enumeration enumeration = props.propertyNames();
+ props = PropertyResolver.resolve( props );
while( enumeration.hasMoreElements() )
{
String name = (String) enumeration.nextElement();

Modified: trunk/main/lang/module/etc/module.xsd
===================================================================
--- trunk/main/lang/module/etc/module.xsd 2006-11-22 12:24:55 UTC (rev
1785)
+++ trunk/main/lang/module/etc/module.xsd 2006-11-24 13:40:29 UTC (rev
1786)
@@ -36,7 +36,7 @@
<complexType name="ModulesType">
<choice minOccurs="0" maxOccurs="unbounded">
<element name="module" type="this:ModuleType"/>
- <element name="import" type="this:FileImportType"/>
+ <!--<element name="import" type="this:FileImportType"/>-->
</choice>
</complexType>

@@ -83,7 +83,7 @@
<element name="module" type="this:ModuleType"/>
<element name="project" type="this:ProjectType"/>
<element name="resource" type="this:ResourceType"/>
- <element name="import" type="this:FileImportType"/>
+ <!--<element name="import" type="this:FileImportType"/>-->
</choice>
</extension>
</complexContent>

Modified:
trunk/main/station/server/src/main/net/dpml/station/server/StationServerPlugin.java
===================================================================
---
trunk/main/station/server/src/main/net/dpml/station/server/StationServerPlugin.java
2006-11-22 12:24:55 UTC (rev 1785)
+++
trunk/main/station/server/src/main/net/dpml/station/server/StationServerPlugin.java
2006-11-24 13:40:29 UTC (rev 1786)
@@ -22,6 +22,8 @@
import java.net.URL;
import java.rmi.registry.Registry;

+import javax.management.NotCompliantMBeanException;
+
import net.dpml.cli.Option;
import net.dpml.cli.Group;
import net.dpml.cli.CommandLine;
@@ -110,6 +112,13 @@
new TransitController( m_logger, m_model );
m_logger.info( "Transit controller established." );
}
+ catch( NotCompliantMBeanException ncdfe )
+ {
+ if( m_logger.isWarnEnabled() )
+ {
+ m_logger.warn( "JMX support requires SE6." );
+ }
+ }
catch( NoClassDefFoundError ncdfe )
{
if( m_logger.isWarnEnabled() )




  • r1786 - in trunk/main: depot depot/test depot/test/src depot/test/src/test depot/test/src/test/net depot/test/src/test/net/dpml depot/test/src/test/net/dpml/tools depot/test/src/test/net/dpml/tools/test depot/tools/src/main/net/dpml/tools/tasks lang/module/etc station/server/src/main/net/dpml/station/server, mcconnell at BerliOS, 11/24/2006

Archive powered by MHonArc 2.6.24.

Top of Page