EMBJOPR SVN: r49 - trunk/core.
by embjopr-commits＠lists.jboss.org
Author: ips
Date: 2008-11-14 14:06:48 -0500 (Fri, 14 Nov 2008)
New Revision: 49
Modified:
trunk/core/pom.xml
Log:
include the delete/touch necessary to hot-redeploy war to AS5 in dev profile
Modified: trunk/core/pom.xml
===================================================================
--- trunk/core/pom.xml 2008-11-13 18:41:30 UTC (rev 48)
+++ trunk/core/pom.xml 2008-11-14 19:06:48 UTC (rev 49)
@@ -382,8 +382,13 @@
</copy>
<!-- TODO: Also copy the files from src/main/webapp-filtered/, and then filter them ourselves. -->
+ <!--
<echo>*** Touching <jbas5.warDir>/WEB-INF/web.xml to force redeploy...</echo>
- <touch file="${jbas5.warDir}/WEB-INF/web.xml" />
+ <touch file="${jbas5.warDir}/WEB-INF/web.xml" />
+ -->
+ <echo>*** Deleting then touching <jbas5.warDir>/redeploy-trigger.txt to force redeploy...</echo>
+ <delete file="${jbas5.warDir}/redeploy-trigger.txt" quiet="true" />
+ <touch file="${jbas5.warDir}/redeploy-trigger.txt" />
</tasks>
</configuration>
<goals>
15 years, 5 months
EMBJOPR SVN: r48 - in trunk/core/src: main/java/org/jboss/on/embedded/converter and 6 other directories.
by embjopr-commits＠lists.jboss.org
Author: ips
Date: 2008-11-13 13:41:30 -0500 (Thu, 13 Nov 2008)
New Revision: 48
Modified:
trunk/core/src/main/java/org/jboss/on/embedded/bean/MeasurementComparator.java
trunk/core/src/main/java/org/jboss/on/embedded/bean/ResourceListItem.java
trunk/core/src/main/java/org/jboss/on/embedded/converter/OperationDefinitionConverter.java
trunk/core/src/main/java/org/jboss/on/embedded/manager/ResourceManager.java
trunk/core/src/main/java/org/jboss/on/embedded/manager/ResourceManagerFactory.java
trunk/core/src/main/java/org/jboss/on/embedded/manager/pc/DiscoveryException.java
trunk/core/src/main/java/org/jboss/on/embedded/ui/configuration/resource/ConfigHelperFactory.java
trunk/core/src/main/java/org/jboss/on/embedded/ui/configuration/resource/IdChunkFactory.java
trunk/core/src/main/java/org/jboss/on/embedded/ui/configuration/resource/ResourceConfigurationUIBean.java
trunk/core/src/main/java/org/jboss/on/embedded/ui/configuration/resource/TemplateDropDownPopulator.java
trunk/core/src/test/java/org/jboss/on/embedded/manager/test/TemplatePopulatorTest.java
trunk/core/src/test/java/org/jboss/on/embedded/test/TextareaMapConverterTest.java
trunk/core/src/test/java/org/jboss/on/embedded/util/EmbeddedSeamHelper.java
Log:
replace invalid "@author:" javadoc tags with "@author"
Modified: trunk/core/src/main/java/org/jboss/on/embedded/bean/MeasurementComparator.java
===================================================================
--- trunk/core/src/main/java/org/jboss/on/embedded/bean/MeasurementComparator.java 2008-11-13 16:23:02 UTC (rev 47)
+++ trunk/core/src/main/java/org/jboss/on/embedded/bean/MeasurementComparator.java 2008-11-13 18:41:30 UTC (rev 48)
@@ -26,7 +26,7 @@
import java.util.Map;
/**
- * @author: Mark Spritzler
+ * @author Mark Spritzler
* TODO evaluate whether this class is needed
* why cant we use the order defined by measurementDefinitionMap which should be ordered
* as the measurements are specified in the plugin descriptor
Modified: trunk/core/src/main/java/org/jboss/on/embedded/bean/ResourceListItem.java
===================================================================
--- trunk/core/src/main/java/org/jboss/on/embedded/bean/ResourceListItem.java 2008-11-13 16:23:02 UTC (rev 47)
+++ trunk/core/src/main/java/org/jboss/on/embedded/bean/ResourceListItem.java 2008-11-13 18:41:30 UTC (rev 48)
@@ -28,7 +28,7 @@
* Bean used to hold all of the data necessary to render a table of resources. Quick accessors are provided to
* the nested attributes to minimize the chaining that needs to take place in the XHTML pages.
*
- * @author: Jason Dobies
+ * @author Jason Dobies
*/
public class ResourceListItem implements Serializable
{
Modified: trunk/core/src/main/java/org/jboss/on/embedded/converter/OperationDefinitionConverter.java
===================================================================
--- trunk/core/src/main/java/org/jboss/on/embedded/converter/OperationDefinitionConverter.java 2008-11-13 16:23:02 UTC (rev 47)
+++ trunk/core/src/main/java/org/jboss/on/embedded/converter/OperationDefinitionConverter.java 2008-11-13 18:41:30 UTC (rev 48)
@@ -28,7 +28,7 @@
/**
- * @author: Mark Spritzler
+ * @author Mark Spritzler
*/
public class OperationDefinitionConverter implements Converter
{
Modified: trunk/core/src/main/java/org/jboss/on/embedded/manager/ResourceManager.java
===================================================================
--- trunk/core/src/main/java/org/jboss/on/embedded/manager/ResourceManager.java 2008-11-13 16:23:02 UTC (rev 47)
+++ trunk/core/src/main/java/org/jboss/on/embedded/manager/ResourceManager.java 2008-11-13 18:41:30 UTC (rev 48)
@@ -38,7 +38,7 @@
/**
* API used to retrieve backend data for the embedded console.
*
- * @author: Jason Dobies
+ * @author Jason Dobies
*/
public interface ResourceManager
{
Modified: trunk/core/src/main/java/org/jboss/on/embedded/manager/ResourceManagerFactory.java
===================================================================
--- trunk/core/src/main/java/org/jboss/on/embedded/manager/ResourceManagerFactory.java 2008-11-13 16:23:02 UTC (rev 47)
+++ trunk/core/src/main/java/org/jboss/on/embedded/manager/ResourceManagerFactory.java 2008-11-13 18:41:30 UTC (rev 48)
@@ -24,7 +24,7 @@
/**
* Factory used to retrieve instances of <code>ResourceManager</code> for use by UI actions.
*
- * @author: Jason Dobies
+ * @author Jason Dobies
*/
public class ResourceManagerFactory
{
Modified: trunk/core/src/main/java/org/jboss/on/embedded/manager/pc/DiscoveryException.java
===================================================================
--- trunk/core/src/main/java/org/jboss/on/embedded/manager/pc/DiscoveryException.java 2008-11-13 16:23:02 UTC (rev 47)
+++ trunk/core/src/main/java/org/jboss/on/embedded/manager/pc/DiscoveryException.java 2008-11-13 18:41:30 UTC (rev 48)
@@ -20,7 +20,7 @@
package org.jboss.on.embedded.manager.pc;
/**
- * @author: Jason Dobies
+ * @author Jason Dobies
*/
public class DiscoveryException
extends Exception
Modified: trunk/core/src/main/java/org/jboss/on/embedded/ui/configuration/resource/ConfigHelperFactory.java
===================================================================
--- trunk/core/src/main/java/org/jboss/on/embedded/ui/configuration/resource/ConfigHelperFactory.java 2008-11-13 16:23:02 UTC (rev 47)
+++ trunk/core/src/main/java/org/jboss/on/embedded/ui/configuration/resource/ConfigHelperFactory.java 2008-11-13 18:41:30 UTC (rev 48)
@@ -25,7 +25,7 @@
import org.rhq.core.gui.configuration.ConfigHelperUIBean;
/**
- * @author: Charles Crouch
+ * @author Charles Crouch
*/
@Name("configHelperFactory")
public class ConfigHelperFactory
Modified: trunk/core/src/main/java/org/jboss/on/embedded/ui/configuration/resource/IdChunkFactory.java
===================================================================
--- trunk/core/src/main/java/org/jboss/on/embedded/ui/configuration/resource/IdChunkFactory.java 2008-11-13 16:23:02 UTC (rev 47)
+++ trunk/core/src/main/java/org/jboss/on/embedded/ui/configuration/resource/IdChunkFactory.java 2008-11-13 18:41:30 UTC (rev 48)
@@ -25,7 +25,7 @@
import org.rhq.core.gui.util.IdChunkGeneratorUIBean;
/**
- * @author: Mark Spritzler
+ * @author Mark Spritzler
*/
@Name("idChunkFactory")
public class IdChunkFactory
Modified: trunk/core/src/main/java/org/jboss/on/embedded/ui/configuration/resource/ResourceConfigurationUIBean.java
===================================================================
--- trunk/core/src/main/java/org/jboss/on/embedded/ui/configuration/resource/ResourceConfigurationUIBean.java 2008-11-13 16:23:02 UTC (rev 47)
+++ trunk/core/src/main/java/org/jboss/on/embedded/ui/configuration/resource/ResourceConfigurationUIBean.java 2008-11-13 18:41:30 UTC (rev 48)
@@ -55,7 +55,7 @@
* Managed Bean to handle Resource Configuration pages. Both Create and Edit Resource configurations
* are handled by this class.
*
- * @author: Mark Spritzler
+ * @author Mark Spritzler
*/
@Name("resourceConfigurationUIBean")
@Scope(ScopeType.CONVERSATION)
Modified: trunk/core/src/main/java/org/jboss/on/embedded/ui/configuration/resource/TemplateDropDownPopulator.java
===================================================================
--- trunk/core/src/main/java/org/jboss/on/embedded/ui/configuration/resource/TemplateDropDownPopulator.java 2008-11-13 16:23:02 UTC (rev 47)
+++ trunk/core/src/main/java/org/jboss/on/embedded/ui/configuration/resource/TemplateDropDownPopulator.java 2008-11-13 18:41:30 UTC (rev 48)
@@ -42,7 +42,7 @@
import java.util.Map;
/**
- * @author: Mark Spritzler
+ * @author Mark Spritzler
*/
@Name("templateDropDownPopulator")
public class TemplateDropDownPopulator
Modified: trunk/core/src/test/java/org/jboss/on/embedded/manager/test/TemplatePopulatorTest.java
===================================================================
--- trunk/core/src/test/java/org/jboss/on/embedded/manager/test/TemplatePopulatorTest.java 2008-11-13 16:23:02 UTC (rev 47)
+++ trunk/core/src/test/java/org/jboss/on/embedded/manager/test/TemplatePopulatorTest.java 2008-11-13 18:41:30 UTC (rev 48)
@@ -32,7 +32,7 @@
import org.rhq.core.clientapi.agent.configuration.ConfigurationUtility;
/**
- * @author: Jason Dobies
+ * @author Jason Dobies
*/
public class TemplatePopulatorTest
{
Modified: trunk/core/src/test/java/org/jboss/on/embedded/test/TextareaMapConverterTest.java
===================================================================
--- trunk/core/src/test/java/org/jboss/on/embedded/test/TextareaMapConverterTest.java 2008-11-13 16:23:02 UTC (rev 47)
+++ trunk/core/src/test/java/org/jboss/on/embedded/test/TextareaMapConverterTest.java 2008-11-13 18:41:30 UTC (rev 48)
@@ -30,7 +30,7 @@
import org.rhq.core.domain.configuration.PropertySimple;
/**
- * @author: Jason Dobies
+ * @author Jason Dobies
*/
public class TextareaMapConverterTest
{
Modified: trunk/core/src/test/java/org/jboss/on/embedded/util/EmbeddedSeamHelper.java
===================================================================
--- trunk/core/src/test/java/org/jboss/on/embedded/util/EmbeddedSeamHelper.java 2008-11-13 16:23:02 UTC (rev 47)
+++ trunk/core/src/test/java/org/jboss/on/embedded/util/EmbeddedSeamHelper.java 2008-11-13 18:41:30 UTC (rev 48)
@@ -29,7 +29,7 @@
import org.apache.commons.logging.LogFactory;
/**
- * @author: mspritzler
+ * @author mspritzler
*/
public class EmbeddedSeamHelper extends SeamTest
{
15 years, 5 months
EMBJOPR SVN: r47 - trunk/jbas5.
by embjopr-commits＠lists.jboss.org
Author: ips
Date: 2008-11-13 11:23:02 -0500 (Thu, 13 Nov 2008)
New Revision: 47
Modified:
trunk/jbas5/pom.xml
Log:
make delete task quiet
Modified: trunk/jbas5/pom.xml
===================================================================
--- trunk/jbas5/pom.xml 2008-11-13 15:52:57 UTC (rev 46)
+++ trunk/jbas5/pom.xml 2008-11-13 16:23:02 UTC (rev 47)
@@ -190,7 +190,7 @@
<touch file="${deployment.dir}/WEB-INF/web.xml" />
-->
<echo>*** Deleting then touching <warDir>/redeploy-trigger.txt to force redeploy...</echo>
- <delete file="${deployment.dir}/redeploy-trigger.txt" />
+ <delete file="${deployment.dir}/redeploy-trigger.txt" quiet="true" />
<touch file="${deployment.dir}/redeploy-trigger.txt" />
</tasks>
</configuration>
15 years, 5 months
EMBJOPR SVN: r46 - in trunk/jbas5: etc and 1 other directory.
by embjopr-commits＠lists.jboss.org
Author: ips
Date: 2008-11-13 10:52:57 -0500 (Thu, 13 Nov 2008)
New Revision: 46
Added:
trunk/jbas5/etc/
trunk/jbas5/etc/jboss-log4j.xml
trunk/jbas5/etc/run.bat
Log:
replacements for jboss-log4j.xml and run.bat for use when deploying the admin console to JBAS5
Added: trunk/jbas5/etc/jboss-log4j.xml
===================================================================
--- trunk/jbas5/etc/jboss-log4j.xml (rev 0)
+++ trunk/jbas5/etc/jboss-log4j.xml 2008-11-13 15:52:57 UTC (rev 46)
@@ -0,0 +1,335 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE log4j:configuration SYSTEM "log4j.dtd">
+
+<!-- ===================================================================== -->
+<!-- -->
+<!-- Log4j Configuration -->
+<!-- -->
+<!-- ===================================================================== -->
+
+<!-- $Id$ -->
+
+<!--
+ | For more configuration information and examples see the Jakarta Log4j
+ | owebsite: http://jakarta.apache.org/log4j
+ -->
+
+<log4j:configuration xmlns:log4j="http://jakarta.apache.org/log4j/" debug="false">
+
+ <!-- ================================= -->
+ <!-- Preserve messages in a local file -->
+ <!-- ================================= -->
+
+ <!-- A time/date based rolling appender -->
+ <appender name="FILE" class="org.jboss.logging.appender.DailyRollingFileAppender">
+ <errorHandler class="org.jboss.logging.util.OnlyOnceErrorHandler"/>
+ <param name="File" value="${jboss.server.log.dir}/server.log"/>
+ <param name="Append" value="false"/>
+
+ <!-- Rollover at midnight each day -->
+ <param name="DatePattern" value="'.'yyyy-MM-dd"/>
+
+ <!-- Rollover at the top of each hour
+ <param name="DatePattern" value="'.'yyyy-MM-dd-HH"/>
+ -->
+
+ <layout class="org.apache.log4j.PatternLayout">
+ <!-- The default pattern: Date Priority [Category] (Thread) Message\n -->
+ <param name="ConversionPattern" value="%d %-5p [%c] (%t) %m%n"/>
+
+ <!-- The full pattern: Date MS Priority [Category] (Thread:NDC) Message\n
+ <param name="ConversionPattern" value="%d %-5r %-5p [%c] (%t:%x) %m%n"/>
+ -->
+ </layout>
+ </appender>
+
+ <!-- A size based file rolling appender
+ <appender name="FILE" class="org.jboss.logging.appender.RollingFileAppender">
+ <errorHandler class="org.jboss.logging.util.OnlyOnceErrorHandler"/>
+ <param name="File" value="${jboss.server.log.dir}/server.log"/>
+ <param name="Append" value="false"/>
+ <param name="MaxFileSize" value="500KB"/>
+ <param name="MaxBackupIndex" value="1"/>
+
+ <layout class="org.apache.log4j.PatternLayout">
+ <param name="ConversionPattern" value="%d %-5p [%c] %m%n"/>
+ </layout>
+ </appender>
+ -->
+
+ <!-- ============================== -->
+ <!-- Append messages to the console -->
+ <!-- ============================== -->
+
+ <appender name="CONSOLE" class="org.apache.log4j.ConsoleAppender">
+ <errorHandler class="org.jboss.logging.util.OnlyOnceErrorHandler"/>
+ <param name="Target" value="System.out"/>
+ <!--<param name="Threshold" value="INFO"/>-->
+
+ <layout class="org.apache.log4j.PatternLayout">
+ <!-- The default pattern: Date Priority [Category] Message\n -->
+ <param name="ConversionPattern" value="%d{ABSOLUTE} %-5p [%c{1}] %m%n"/>
+ </layout>
+ </appender>
+
+ <!-- ====================== -->
+ <!-- More Appender examples -->
+ <!-- ====================== -->
+
+ <!-- Buffer events and log them asynchronously
+ <appender name="ASYNC" class="org.apache.log4j.AsyncAppender">
+ <errorHandler class="org.jboss.logging.util.OnlyOnceErrorHandler"/>
+ <appender-ref ref="FILE"/>
+ <appender-ref ref="CONSOLE"/>
+ <appender-ref ref="SMTP"/>
+ </appender>
+ -->
+
+ <!-- EMail events to an administrator
+ <appender name="SMTP" class="org.apache.log4j.net.SMTPAppender">
+ <errorHandler class="org.jboss.logging.util.OnlyOnceErrorHandler"/>
+ <param name="Threshold" value="ERROR"/>
+ <param name="To" value="admin(a)myhost.domain.com"/>
+ <param name="From" value="nobody(a)myhost.domain.com"/>
+ <param name="Subject" value="JBoss Sever Errors"/>
+ <param name="SMTPHost" value="localhost"/>
+ <param name="BufferSize" value="10"/>
+ <layout class="org.apache.log4j.PatternLayout">
+ <param name="ConversionPattern" value="[%d{ABSOLUTE},%c{1}] %m%n"/>
+ </layout>
+ </appender>
+ -->
+
+ <!-- Syslog events
+ <appender name="SYSLOG" class="org.apache.log4j.net.SyslogAppender">
+ <errorHandler class="org.jboss.logging.util.OnlyOnceErrorHandler"/>
+ <param name="Facility" value="LOCAL7"/>
+ <param name="FacilityPrinting" value="true"/>
+ <param name="SyslogHost" value="localhost"/>
+ <layout class="org.apache.log4j.PatternLayout">
+ <param name="ConversionPattern" value="[%d{ABSOLUTE},%c{1}] %m%n"/>
+ </layout>
+ </appender>
+ -->
+
+ <!-- Log events to JMS (requires a topic to be created)
+ <appender name="JMS" class="org.apache.log4j.net.JMSAppender">
+ <errorHandler class="org.jboss.logging.util.OnlyOnceErrorHandler"/>
+ <param name="Threshold" value="ERROR"/>
+ <param name="TopicConnectionFactoryBindingName" value="java:/ConnectionFactory"/>
+ <param name="TopicBindingName" value="topic/MyErrorsTopic"/>
+ </appender>
+ -->
+
+ <!-- Log events through SNMP
+ <appender name="TRAP_LOG" class="org.apache.log4j.ext.SNMPTrapAppender">
+ <errorHandler class="org.jboss.logging.util.OnlyOnceErrorHandler"/>
+ <param name="ImplementationClassName" value="org.apache.log4j.ext.JoeSNMPTrapSender"/>
+ <param name="ManagementHost" value="127.0.0.1"/>
+ <param name="ManagementHostTrapListenPort" value="162"/>
+ <param name="EnterpriseOID" value="1.3.6.1.4.1.24.0"/>
+ <param name="LocalIPAddress" value="127.0.0.1"/>
+ <param name="LocalTrapSendPort" value="161"/>
+ <param name="GenericTrapType" value="6"/>
+ <param name="SpecificTrapType" value="12345678"/>
+ <param name="CommunityString" value="public"/>
+ <param name="ForwardStackTraceWithTrap" value="true"/>
+ <param name="Threshold" value="DEBUG"/>
+ <param name="ApplicationTrapOID" value="1.3.6.1.4.1.24.12.10.22.64"/>
+ <layout class="org.apache.log4j.PatternLayout">
+ <param name="ConversionPattern" value="%d,%p,[%t],[%c],%m%n"/>
+ </layout>
+ </appender>
+ -->
+
+ <!-- Emit events as JMX notifications
+ <appender name="JMX" class="org.jboss.monitor.services.JMXNotificationAppender">
+ <errorHandler class="org.jboss.logging.util.OnlyOnceErrorHandler"/>
+
+ <param name="Threshold" value="WARN"/>
+ <param name="ObjectName" value="jboss.system:service=Logging,type=JMXNotificationAppender"/>
+
+ <layout class="org.apache.log4j.PatternLayout">
+ <param name="ConversionPattern" value="%d %-5p [%c] %m"/>
+ </layout>
+ </appender>
+ -->
+
+ <!-- Security AUDIT Appender -->
+ <appender name="AUDIT" class="org.jboss.logging.appender.DailyRollingFileAppender">
+ <errorHandler class="org.jboss.logging.util.OnlyOnceErrorHandler"/>
+ <param name="File" value="${jboss.server.log.dir}/audit.log"/>
+ <param name="Append" value="true"/>
+ <param name="DatePattern" value="'.'yyyy-MM-dd"/>
+ <layout class="org.apache.log4j.PatternLayout">
+ <param name="ConversionPattern" value="%d %-5p [%c] (%t:%x) %m%n"/>
+ </layout>
+ </appender>
+
+ <!-- ================ -->
+ <!-- Limit categories -->
+ <!-- ================ -->
+
+ <!-- Limit the org.apache category to INFO as its DEBUG is verbose -->
+ <category name="org.apache">
+ <priority value="INFO"/>
+ </category>
+
+ <!-- Limit JSF logging to DEBUG. FINER and FINEST will not be logged -->
+ <category name="javax.enterprise.resource.webcontainer.jsf">
+ <priority value="DEBUG" />
+ </category>
+
+ <!-- Limit the jacorb category to WARN as its INFO is verbose -->
+ <category name="jacorb">
+ <priority value="WARN"/>
+ </category>
+
+ <!-- Set the logging level of the JSF implementation -->
+ <category name="javax.enterprise.resource.webcontainer.jsf">
+ <priority value="INFO" />
+ </category>
+
+ <!-- Limit the org.jgroups category to WARN as its INFO is verbose -->
+ <category name="org.jgroups">
+ <priority value="WARN"/>
+ </category>
+
+ <!-- Limit the org.quartz category to INFO as its DEBUG is verbose -->
+ <category name="org.quartz">
+ <priority value="INFO"/>
+ </category>
+
+ <!-- Limit JBoss categories
+ <category name="org.jboss">
+ <priority value="INFO"/>
+ </category>
+ -->
+
+ <!-- Limit the JSR77 categories -->
+ <category name="org.jboss.management">
+ <priority value="INFO"/>
+ </category>
+
+ <!-- Show the evolution of the DataSource pool in the logs [inUse/Available/Max]
+ <category name="org.jboss.resource.connectionmanager.JBossManagedConnectionPool">
+ <priority value="TRACE"/>
+ </category>
+ -->
+
+ <!-- Category specifically for Security Audit Provider -->
+ <category name="org.jboss.security.audit.providers.LogAuditProvider" additivity="false">
+ <priority value="TRACE"/>
+ <appender-ref ref="AUDIT"/>
+ </category>
+
+ <!-- Limit the org.jboss.serial (jboss-serialization) to INFO as its DEBUG is verbose -->
+ <category name="org.jboss.serial">
+ <priority value="INFO"/>
+ </category>
+
+ <!-- Decrease the priority threshold for the org.jboss.varia category
+ <category name="org.jboss.varia">
+ <priority value="DEBUG"/>
+ </category>
+ -->
+
+ <!-- Enable JBossWS message tracing
+ <category name="org.jboss.ws.core.MessageTrace">
+ <priority value="TRACE"/>
+ </category>
+ -->
+
+ <!--
+ | An example of enabling the custom TRACE level priority that is used
+ | by the JBoss internals to diagnose low level details. This example
+ | turns on TRACE level msgs for the org.jboss.ejb.plugins package and its
+ | subpackages. This will produce A LOT of logging output.
+ |
+ | Note: since jboss AS 4.2.x, the trace level is supported natively by
+ | log4j, so although the custom org.jboss.logging.XLevel priority will
+ | still work, there is no need to use it. The two examples that follow
+ | will both enable trace logging.
+ <category name="org.jboss.system">
+ <priority value="TRACE" class="org.jboss.logging.XLevel"/>
+ </category>
+ <category name="org.jboss.ejb.plugins">
+ <priority value="TRACE"/>
+ </category>
+ -->
+
+ <!--
+ | Logs these events to SNMP:
+ - server starts/stops
+ - cluster evolution (node death/startup)
+ - When an EJB archive is deployed (and associated verified messages)
+ - When an EAR archive is deployed
+
+ <category name="org.jboss.system.server.Server">
+ <priority value="INFO" />
+ <appender-ref ref="TRAP_LOG"/>
+ </category>
+
+ <category name="org.jboss.ha.framework.interfaces.HAPartition.lifecycle">
+ <priority value="INFO" />
+ <appender-ref ref="TRAP_LOG"/>
+ </category>
+
+ <category name="org.jboss.deployment.MainDeployer">
+ <priority value="ERROR" />
+ <appender-ref ref="TRAP_LOG"/>
+ </category>
+
+ <category name="org.jboss.ejb.EJBDeployer">
+ <priority value="INFO" />
+ <appender-ref ref="TRAP_LOG"/>
+ </category>
+
+ <category name="org.jboss.deployment.EARDeployer">
+ <priority value="INFO" />
+ <appender-ref ref="TRAP_LOG"/>
+ </category>
+ -->
+
+ <!-- Clustering logging -->
+ <!-- Uncomment the following to redirect the org.jgroups and
+ org.jboss.ha categories to a cluster.log file.
+
+ <appender name="CLUSTER" class="org.jboss.logging.appender.RollingFileAppender">
+ <errorHandler class="org.jboss.logging.util.OnlyOnceErrorHandler"/>
+ <param name="File" value="${jboss.server.log.dir}/cluster.log"/>
+ <param name="Append" value="false"/>
+ <param name="MaxFileSize" value="500KB"/>
+ <param name="MaxBackupIndex" value="1"/>
+
+ <layout class="org.apache.log4j.PatternLayout">
+ <param name="ConversionPattern" value="%d %-5p [%c] %m%n"/>
+ </layout>
+ </appender>
+ <category name="org.jgroups">
+ <priority value="DEBUG" />
+ <appender-ref ref="CLUSTER"/>
+ </category>
+ <category name="org.jboss.ha">
+ <priority value="DEBUG" />
+ <appender-ref ref="CLUSTER"/>
+ </category>
+ -->
+
+ <category name="org.jboss.on.embedded"><priority value="DEBUG"/></category>
+ <category name="org.rhq.plugins.jbossas5"><priority value="DEBUG"/></category>
+ <category name="org.jboss.seam"><priority value="WARN"/></category>
+ <category name="com.sun"><priority value="WARN"/></category>
+ <category name="org.rhq.core.pc.inventory.RuntimeDiscoveryExecutor"><priority value="WARN"/></category>
+
+ <!-- ======================= -->
+ <!-- Setup the Root category -->
+ <!-- ======================= -->
+
+ <root>
+ <level value="INFO"/>
+ <appender-ref ref="CONSOLE"/>
+ <appender-ref ref="FILE"/>
+ </root>
+
+</log4j:configuration>
Property changes on: trunk/jbas5/etc/jboss-log4j.xml
___________________________________________________________________
Name: svn:mime-type
+ text/xml
Name: svn:keywords
+ Date Author Id Revision HeadURL
Name: svn:eol-style
+ LF
Added: trunk/jbas5/etc/run.bat
===================================================================
--- trunk/jbas5/etc/run.bat (rev 0)
+++ trunk/jbas5/etc/run.bat 2008-11-13 15:52:57 UTC (rev 46)
@@ -0,0 +1,153 @@
+@echo off
+rem -------------------------------------------------------------------------
+rem JBoss Bootstrap Script for Windows
+rem -------------------------------------------------------------------------
+
+rem $Id$
+
+@if not "%ECHO%" == "" echo %ECHO%
+@if "%OS%" == "Windows_NT" setlocal
+
+if "%OS%" == "Windows_NT" (
+ set "DIRNAME=%~dp0%"
+) else (
+ set DIRNAME=.\
+)
+
+pushd %DIRNAME%..
+if "x%JBOSS_HOME%" == "x" (
+ set "JBOSS_HOME=%CD%"
+)
+popd
+
+set DIRNAME=
+
+if "%OS%" == "Windows_NT" (
+ set "PROGNAME=%~nx0%"
+) else (
+ set "PROGNAME=run.bat"
+)
+
+if "x%JAVA_OPTS%" == "x" (
+ set "JAVA_OPTS=-Dprogram.name=%PROGNAME%"
+) else (
+ set "JAVA_OPTS=%JAVA_OPTS% -Dprogram.name=%PROGNAME%"
+)
+
+if "x%JAVA_HOME%" == "x" (
+ set JAVA=java
+ echo JAVA_HOME is not set. Unexpected results may occur.
+ echo Set JAVA_HOME to the directory of your local JDK to avoid this message.
+) else (
+ set "JAVA=%JAVA_HOME%\bin\java"
+ if exist "%JAVA_HOME%\lib\tools.jar" (
+ set "JAVAC_JAR=%JAVA_HOME%\lib\tools.jar"
+ )
+)
+
+rem Add -server to the JVM options, if supported
+"%JAVA%" -server -version 2>&1 | findstr /I hotspot > nul
+if not errorlevel == 1 (
+ set "JAVA_OPTS=%JAVA_OPTS% -server"
+)
+
+rem Set Java platform if 64-Bit JVM used
+set JAVA_PLATFORM=
+"%JAVA%" -version 2>&1 | findstr /I "64-Bit ^| x86_64" > nul
+if not errorlevel == 1 (
+ if /I "%PROCESSOR_ARCHITECTURE%"=="IA64" (set JAVA_PLATFORM=ia64
+ ) else if /I "%PROCESSOR_ARCHITECTURE%"=="AMD64" (set JAVA_PLATFORM=x64
+ ) else if /I "%PROCESSOR_ARCHITECTURE%"=="x64" (set JAVA_PLATFORM=x64
+ ) else if /I "%PROCESSOR_ARCHITEW6432%"=="IA64" (set JAVA_PLATFORM=i64
+ ) else if /I "%PROCESSOR_ARCHITEW6432%"=="AMD64" (set JAVA_PLATFORM=x64
+ ) else (
+ echo PROCESSOR_ARCHITECTURE is not set. Unexpected results may occur.
+ echo Set PROCESSOR_ARCHITECTURE according to the 64-Bit JVM used.
+ )
+)
+
+if "x%JAVA_PLATFORM%" == "x" set JAVA_PLATFORM=x86
+
+rem Add native to the PATH if present
+set JBOSS_NATIVE_LOC=
+if exist "%JBOSS_HOME%\bin\META-INF\lib\windows-%JAVA_PLATFORM%" (
+ set "JBOSS_NATIVE_HOME=%JBOSS_HOME%\bin\META-INF\lib\windows-%JAVA_PLATFORM%"
+) else if exist "%JBOSS_HOME%\bin\native" (
+ set "JBOSS_NATIVE_HOME=%JBOSS_HOME%\bin\native"
+)
+
+if not "x%JBOSS_NATIVE_HOME%" == "x" (
+ set "PATH=%JBOSS_NATIVE_HOME%;%PATH%;%JBOSS_HOME%\bin"
+ set JAVA_OPTS=%JAVA_OPTS% "-Djava.library.path=%JBOSS_NATIVE_HOME%;%PATH%;%JBOSS_HOME%\bin"
+)
+
+rem Find run.jar, or we can't continue
+
+if exist "%JBOSS_HOME%\bin\run.jar" (
+ if "x%JAVAC_JAR%" == "x" (
+ set "RUNJAR=%JAVAC_JAR%;%JBOSS_HOME%\bin\run.jar"
+ ) else (
+ set "RUNJAR=%JBOSS_HOME%\bin\run.jar"
+ )
+) else (
+ echo Could not locate "%JBOSS_HOME%\bin\run.jar".
+ echo Please check that you are in the bin directory when running this script.
+ goto END
+)
+
+rem If JBOSS_CLASSPATH empty, don't include it, as this will
+rem result in including the local directory in the classpath, which makes
+rem error tracking harder.
+if "x%JBOSS_CLASSPATH%" == "x" (
+ set "RUN_CLASSPATH=%RUNJAR%"
+) else (
+ set "RUN_CLASSPATH=%JBOSS_CLASSPATH%;%RUNJAR%"
+)
+
+set JBOSS_CLASSPATH=%RUN_CLASSPATH%
+
+rem Setup JBoss specific properties
+set JAVA_OPTS=%JAVA_OPTS% -Djboss.platform.mbeanserver -Djbmancon.debug=true
+
+rem JVM memory allocation pool parameters. Modify as appropriate.
+set JAVA_OPTS=%JAVA_OPTS% -Xms100M -Xmx200M -XX:PermSize=100M -XX:MaxPermSize=200M
+
+rem Warn when resolving remote XML dtd/schemas
+set JAVA_OPTS=%JAVA_OPTS% -Dorg.jboss.resolver.warning=true
+
+rem With Sun JVMs reduce the RMI GCs to once per hour
+set JAVA_OPTS=%JAVA_OPTS% -Dsun.rmi.dgc.client.gcInterval=3600000 -Dsun.rmi.dgc.server.gcInterval=3600000
+
+rem JPDA options. Uncomment and modify as appropriate to enable remote debugging.
+set JAVA_OPTS=%JAVA_OPTS% -Xdebug -Xrunjdwp:transport=dt_socket,address=7777,server=y,suspend=n
+
+rem Setup the java endorsed dirs
+set JBOSS_ENDORSED_DIRS=%JBOSS_HOME%\lib\endorsed
+
+echo ===============================================================================
+echo.
+echo JBoss Bootstrap Environment
+echo.
+echo JBOSS_HOME: %JBOSS_HOME%
+echo.
+echo JAVA: %JAVA%
+echo.
+echo JAVA_OPTS: %JAVA_OPTS%
+echo.
+echo CLASSPATH: %JBOSS_CLASSPATH%
+echo.
+echo ===============================================================================
+echo.
+
+:RESTART
+"%JAVA%" %JAVA_OPTS% ^
+ -Djava.endorsed.dirs="%JBOSS_ENDORSED_DIRS%" ^
+ -classpath "%JBOSS_CLASSPATH%" ^
+ org.jboss.Main %*
+
+if ERRORLEVEL 10 goto RESTART
+
+:END
+if "x%NOPAUSE%" == "x" pause
+
+:END_NO_PAUSE
Property changes on: trunk/jbas5/etc/run.bat
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Name: svn:keywords
+ Date Author Id Revision HeadURL
Name: svn:eol-style
+ CRLF
15 years, 5 months
EMBJOPR SVN: r45 - in trunk: jbas5 and 1 other directory.
by embjopr-commits＠lists.jboss.org
Author: ips
Date: 2008-11-13 10:37:09 -0500 (Thu, 13 Nov 2008)
New Revision: 45
Modified:
trunk/jbas4/pom.xml
trunk/jbas5/pom.xml
Log:
fix so, with the dev profile active, jboss-as plugins get copied under target as well as to the dev deploy location; got AS5 hot redeploy of war dir in dev profile working via temporary workaround (see http://www.jboss.com/index.html?module=bb&op=viewtopic&p=4188979#4188979)
Modified: trunk/jbas4/pom.xml
===================================================================
--- trunk/jbas4/pom.xml 2008-11-13 15:33:11 UTC (rev 44)
+++ trunk/jbas4/pom.xml 2008-11-13 15:37:09 UTC (rev 45)
@@ -147,7 +147,7 @@
<id>dev</id>
<properties>
- <warDir>${jbas4.configDir}/deploy/${project.build.finalName}.war</warDir>
+ <warDeployDir>${jbas4.configDir}/deploy/${project.build.finalName}.war</warDeployDir>
</properties>
<build>
@@ -163,7 +163,7 @@
<phase>package</phase>
<configuration>
<tasks>
- <property name="deployment.dir" location="${warDir}" />
+ <property name="deployment.dir" location="${warDeployDir}" />
<echo>*** Copying updated files from target${file.separator}${project.build.finalName} to <warDir>...</echo>
<touch file="${basedir}/target/${project.build.finalName}/WEB-INF/classes/messages.properties" />
<copy todir="${deployment.dir}" verbose="${embedded.verbose}">
@@ -174,6 +174,8 @@
<include name="META-INF/**" />
</patternset>
</unjar>
+ <echo>*** Touching <warDir>/WEB-INF/web.xml to force redeploy...</echo>
+ <touch file="${deployment.dir}/WEB-INF/web.xml" />
</tasks>
</configuration>
<goals>
Modified: trunk/jbas5/pom.xml
===================================================================
--- trunk/jbas5/pom.xml 2008-11-13 15:33:11 UTC (rev 44)
+++ trunk/jbas5/pom.xml 2008-11-13 15:37:09 UTC (rev 45)
@@ -158,7 +158,7 @@
<id>dev</id>
<properties>
- <warDir>${jbas5.configDir}/deploy/${project.build.finalName}.war</warDir>
+ <warDeployDir>${jbas5.configDir}/deploy/${project.build.finalName}.war</warDeployDir>
</properties>
<build>
@@ -174,7 +174,7 @@
<phase>package</phase>
<configuration>
<tasks>
- <property name="deployment.dir" location="${warDir}" />
+ <property name="deployment.dir" location="${warDeployDir}" />
<echo>*** Copying updated files from target${file.separator}${project.build.finalName} to <warDir>...</echo>
<touch file="${basedir}/target/${project.build.finalName}/WEB-INF/classes/messages.properties" />
<copy todir="${deployment.dir}" verbose="${embedded.verbose}">
@@ -185,6 +185,13 @@
<include name="META-INF/**" />
</patternset>
</unjar>
+ <!--
+ <echo>*** Touching <warDir>/WEB-INF/web.xml to force redeploy...</echo>
+ <touch file="${deployment.dir}/WEB-INF/web.xml" />
+ -->
+ <echo>*** Deleting then touching <warDir>/redeploy-trigger.txt to force redeploy...</echo>
+ <delete file="${deployment.dir}/redeploy-trigger.txt" />
+ <touch file="${deployment.dir}/redeploy-trigger.txt" />
</tasks>
</configuration>
<goals>
15 years, 5 months
EMBJOPR SVN: r44 - trunk/core/src/main/java/org/jboss/on/embedded/ui.
by embjopr-commits＠lists.jboss.org
Author: ips
Date: 2008-11-13 10:33:11 -0500 (Thu, 13 Nov 2008)
New Revision: 44
Modified:
trunk/core/src/main/java/org/jboss/on/embedded/ui/DebugAction.java
Log:
add a bit of javadoc
Modified: trunk/core/src/main/java/org/jboss/on/embedded/ui/DebugAction.java
===================================================================
--- trunk/core/src/main/java/org/jboss/on/embedded/ui/DebugAction.java 2008-11-11 09:39:51 UTC (rev 43)
+++ trunk/core/src/main/java/org/jboss/on/embedded/ui/DebugAction.java 2008-11-13 15:33:11 UTC (rev 44)
@@ -27,6 +27,8 @@
import org.jboss.seam.annotations.Out;
/**
+ * A Seam component that contains actions used for debugging purposes.
+ *
* @author Ian Springer
*/
@Name("debugAction")
@@ -63,5 +65,5 @@
}
}
}
- }
+ }
}
15 years, 5 months
EMBJOPR SVN: r43 - trunk.
by embjopr-commits＠lists.jboss.org
Author: joe.marques(a)jboss.com
Date: 2008-11-11 04:39:51 -0500 (Tue, 11 Nov 2008)
New Revision: 43
Modified:
trunk/.classpath
Log:
update eclipse classpath to the latest jsf-api reference by core/pom.xml
Modified: trunk/.classpath
===================================================================
--- trunk/.classpath 2008-11-10 21:59:42 UTC (rev 42)
+++ trunk/.classpath 2008-11-11 09:39:51 UTC (rev 43)
@@ -32,7 +32,7 @@
<classpathentry kind="var" path="M2_REPO/org/jboss/seam/jboss-seam-debug/2.0.2.SP1/jboss-seam-debug-2.0.2.SP1.jar" sourcepath="M2_REPO/org/jboss/seam/jboss-seam-debug/2.0.2.SP1/jboss-seam-debug-2.0.2.SP1-sources.jar"/>
<classpathentry kind="var" path="M2_REPO/org/jboss/seam/jboss-seam-ui/2.0.2.SP1/jboss-seam-ui-2.0.2.SP1.jar" sourcepath="M2_REPO/org/jboss/seam/jboss-seam-ui/2.0.2.SP1/jboss-seam-ui-2.0.2.SP1-sources.jar"/>
<classpathentry kind="var" path="M2_REPO/jdom/jdom/1.0/jdom-1.0.jar" sourcepath="M2_REPO/jdom/jdom/1.0/jdom-1.0-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/javax/faces/jsf-api/1.2_09/jsf-api-1.2_09.jar"/>
+ <classpathentry kind="var" path="M2_REPO/javax/faces/jsf-api/1.2_10/jsf-api-1.2_10.jar"/>
<classpathentry kind="var" path="M2_REPO/com/sun/facelets/jsf-facelets/1.1.15.B1/jsf-facelets-1.1.15.B1.jar" sourcepath="M2_REPO/com/sun/facelets/jsf-facelets/1.1.15.B1/jsf-facelets-1.1.15.B1-sources.jar"/>
<classpathentry kind="var" path="M2_REPO/javax/servlet/jsp-api/2.0/jsp-api-2.0.jar"/>
<classpathentry kind="var" path="M2_REPO/javax/transaction/jta/1.0.1B/jta-1.0.1B.jar"/>
15 years, 5 months
EMBJOPR SVN: r42 - trunk.
by embjopr-commits＠lists.jboss.org
Author: ips
Date: 2008-11-10 16:59:42 -0500 (Mon, 10 Nov 2008)
New Revision: 42
Modified:
trunk/INSTALL.txt
Log:
log level for org.jboss.seam and other noisy categories should be "WARN", not "DEBUG"
Modified: trunk/INSTALL.txt
===================================================================
--- trunk/INSTALL.txt 2008-11-10 19:44:47 UTC (rev 41)
+++ trunk/INSTALL.txt 2008-11-10 21:59:42 UTC (rev 42)
@@ -13,9 +13,9 @@
3) (OPTIONAL) Modify ${JBOSS_CONFIG_DIR}/conf/jboss-log4j.xml, and add the following
to turn down the verbosity for some overly noisy categories:
- <category name="org.jboss.seam"><priority value="DEBUG"/></category>
- <category name="com.sun"><priority value="DEBUG"/></category>
- <category name="org.rhq.core.pc.inventory.RuntimeDiscoveryExecutor"><priority value="DEBUG"/></category>
+ <category name="org.jboss.seam"><priority value="WARN"/></category>
+ <category name="com.sun"><priority value="WARN"/></category>
+ <category name="org.rhq.core.pc.inventory.RuntimeDiscoveryExecutor"><priority value="WARN"/></category>
4) Stop your JBAS instance.
15 years, 5 months
EMBJOPR SVN: r41 - in trunk/core/src/main: webapp/secure and 1 other directory.
by embjopr-commits＠lists.jboss.org
Author: ips
Date: 2008-11-10 14:44:47 -0500 (Mon, 10 Nov 2008)
New Revision: 41
Modified:
trunk/core/src/main/java/org/jboss/on/embedded/ui/content/CreateContentBackedResourceAction.java
trunk/core/src/main/webapp/secure/resourceContentCreate.xhtml
Log:
don't barf if the resource type does not define a deploy time config (fix for https://jira.jboss.org/jira/browse/EMBJOPR-30)
Modified: trunk/core/src/main/java/org/jboss/on/embedded/ui/content/CreateContentBackedResourceAction.java
===================================================================
--- trunk/core/src/main/java/org/jboss/on/embedded/ui/content/CreateContentBackedResourceAction.java 2008-11-10 17:45:40 UTC (rev 40)
+++ trunk/core/src/main/java/org/jboss/on/embedded/ui/content/CreateContentBackedResourceAction.java 2008-11-10 19:44:47 UTC (rev 41)
@@ -64,10 +64,10 @@
private final ResourceManager resourceManager = ResourceManagerFactory.resourceManager();
- @Out
+ @Out(required = false)
private ConfigurationDefinition configurationDefinition;
- @Out
+ @Out(required = false)
private Configuration configuration;
@Out
Modified: trunk/core/src/main/webapp/secure/resourceContentCreate.xhtml
===================================================================
--- trunk/core/src/main/webapp/secure/resourceContentCreate.xhtml 2008-11-10 17:45:40 UTC (rev 40)
+++ trunk/core/src/main/webapp/secure/resourceContentCreate.xhtml 2008-11-10 19:44:47 UTC (rev 41)
@@ -50,7 +50,8 @@
<onc:config configurationDefinition="#{configurationDefinition}"
configuration="#{configuration}"
nullConfigurationDefinitionMessage="null ConfigurationDefinition!"
- nullConfigurationMessage="null Configuration!"/>
+ nullConfigurationMessage="null Configuration!"
+ rendered="#{configurationDefinition ne null}"/>
<h:panelGrid columns="2" cellspacing="9">
<h:commandButton value="#{messages['resource.add.button.continue']}"
action="#{createContentBackedResourceAction.createContentBackedResource()}"
15 years, 5 months
EMBJOPR SVN: r40 - in trunk/jbas5: src and 3 other directories.
by embjopr-commits＠lists.jboss.org
Author: charles.crouch(a)jboss.com
Date: 2008-11-10 12:45:40 -0500 (Mon, 10 Nov 2008)
New Revision: 40
Added:
trunk/jbas5/src/
trunk/jbas5/src/main/
trunk/jbas5/src/main/webapp/
trunk/jbas5/src/main/webapp/META-INF/
trunk/jbas5/src/main/webapp/META-INF/jboss-structure.xml
Log:
EMBJOPR-21 tell AS5 to ignore any metadata in our WEB-INF/lib jars
Added: trunk/jbas5/src/main/webapp/META-INF/jboss-structure.xml
===================================================================
--- trunk/jbas5/src/main/webapp/META-INF/jboss-structure.xml (rev 0)
+++ trunk/jbas5/src/main/webapp/META-INF/jboss-structure.xml 2008-11-10 17:45:40 UTC (rev 40)
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Fix for EMBJOPR-21: ignore the EJB3 related metadata -->
+<structure>
+ <context>
+ <path name=""/>
+ <metaDataPath>
+ <path name="WEB-INF"/>
+ </metaDataPath>
+ <classpath>
+ <path name="WEB-INF/classes"/>
+ <path name="WEB-INF/lib" suffixes=".jar"/>
+ </classpath>
+ </context>
+</structure>
15 years, 5 months