diff --git a/assembly/src/sample-conf/default.xml b/assembly/src/sample-conf/default.xml
deleted file mode 100755
index 3fc79dcd8f..0000000000
--- a/assembly/src/sample-conf/default.xml
+++ /dev/null
@@ -1,45 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- START SNIPPET: sample -->
-
-<!DOCTYPE beans PUBLIC  "-//ACTIVEMQ//DTD//EN" "http://activemq.org/dtd/activemq.dtd">
-<beans>
-
-  <!-- A default example of the deployment descriptor -->
-
-  <broker>
-    <connector>
-      <tcpServerTransport uri="tcp://localhost:61616" backlog="1000" useAsyncSend="true" maxOutstandingMessages="50"/>
-    </connector>
-    
-    <persistence>
-      <!-- you can point this to a different datasource -->
-      <jdbcPersistence dataSourceRef="derby-ds"/>
-    </persistence>
-  </broker>
-
-  <!-- ==================================================================== -->
-  <!-- JDBC DataSource Configurations -->
-  <!-- ==================================================================== -->
-  <!-- The Derby Datasource that will be used by the Broker -->
-  <bean id="derby-ds" class="org.apache.commons.dbcp.BasicDataSource" destroy-method="close">
-    <property name="driverClassName">
-      <value>org.apache.derby.jdbc.EmbeddedDriver</value>
-    </property>
-    <property name="url">
-      <!-- Use a URL like 'jdbc:hsqldb:hsql://localhost:9001' if you want to connect to a remote hsqldb -->
-      <value>jdbc:derby:target/data/derbydb;create=true</value>
-    </property>
-    <property name="username">
-      <value></value>
-    </property>
-    <property name="password">
-      <value></value>
-    </property>
-    <property name="poolPreparedStatements">
-      <value>true</value>
-    </property>
-  </bean>
-
-</beans>
-
-<!-- END SNIPPET: sample -->
diff --git a/assembly/src/sample-conf/derby-jdbc-example.xml b/assembly/src/sample-conf/derby-jdbc-example.xml
deleted file mode 100755
index 50eef2b9bc..0000000000
--- a/assembly/src/sample-conf/derby-jdbc-example.xml
+++ /dev/null
@@ -1,45 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE beans PUBLIC  "-//ACTIVEMQ//DTD//EN" "http://activemq.org/dtd/activemq.dtd">
-<beans>
-
-  <!-- ==================================================================== -->
-  <!-- ActiveMQ Broker Configuration -->
-  <!-- ==================================================================== -->
-  <broker>
-    <connector>
-      <serverTransport uri="vm://localhost"/>
-    </connector>
-    <connector>
-      <tcpServerTransport uri="tcp://localhost:61616" backlog="1000" useAsyncSend="true" maxOutstandingMessages="50"/>
-    </connector>
-
-    <persistence>
-      <!-- you can point this to a different datasource -->
-      <jdbcPersistence dataSourceRef="derby-ds"/>
-    </persistence>
-  </broker>
-
-  <!-- ==================================================================== -->
-  <!-- JDBC DataSource Configurations -->
-  <!-- ==================================================================== -->
-  <!-- The Derby Datasource that will be used by the Broker -->
-  <bean id="derby-ds" class="org.apache.commons.dbcp.BasicDataSource" destroy-method="close">
-    <property name="driverClassName">
-      <value>org.apache.derby.jdbc.EmbeddedDriver</value>
-    </property>
-    <property name="url">
-      <!-- Use a URL like 'jdbc:hsqldb:hsql://localhost:9001' if you want to connect to a remote hsqldb -->
-      <value>jdbc:derby:target/data/derbydb;create=true</value>
-    </property>
-    <property name="username">
-      <value></value>
-    </property>
-    <property name="password">
-      <value></value>
-    </property>
-    <property name="poolPreparedStatements">
-      <value>true</value>
-    </property>
-  </bean>
-
-</beans>
diff --git a/assembly/src/sample-conf/derbynet-jdbc-example.xml b/assembly/src/sample-conf/derbynet-jdbc-example.xml
deleted file mode 100755
index c3d8f8040f..0000000000
--- a/assembly/src/sample-conf/derbynet-jdbc-example.xml
+++ /dev/null
@@ -1,45 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE beans PUBLIC  "-//ACTIVEMQ//DTD//EN" "http://activemq.org/dtd/activemq.dtd">
-<beans>
-
-  <!-- ==================================================================== -->
-  <!-- ActiveMQ Broker Configuration -->
-  <!-- ==================================================================== -->
-  <broker>
-    <connector>
-      <serverTransport uri="vm://localhost"/>
-    </connector>
-    <connector>
-      <tcpServerTransport uri="tcp://localhost:61616" backlog="1000" useAsyncSend="true" maxOutstandingMessages="50"/>
-    </connector>
-
-    <persistence>
-      <!-- you can point this to a different datasource -->
-      <jdbcPersistence dataSourceRef="derby-ds"/>
-    </persistence>
-  </broker>
-
-  <!-- ==================================================================== -->
-  <!-- JDBC DataSource Configurations -->
-  <!-- ==================================================================== -->
-  <!-- The HSQL Datasource that will be used by the Broker -->
-  <bean id="derby-ds" class="org.apache.commons.dbcp.BasicDataSource" destroy-method="close">
-    <property name="driverClassName">
-      <value>com.ibm.db2.jcc.DB2Driver</value>
-    </property>
-    <property name="url">
-      <!-- Use a URL like 'jdbc:hsqldb:hsql://localhost:9001' if you want to connect to a remote hsqldb -->
-      <value>jdbc:derby:net://localhost/target/data/derbydb;create=true</value>
-    </property>
-    <property name="username">
-      <value>na</value>
-    </property>
-    <property name="password">
-      <value>na</value>
-    </property>
-    <property name="poolPreparedStatements">
-      <value>true</value>
-    </property>    
-  </bean>
-
-</beans>
diff --git a/assembly/src/sample-conf/jdbc-example.xml b/assembly/src/sample-conf/jdbc-example.xml
deleted file mode 100755
index 2b24cbcea2..0000000000
--- a/assembly/src/sample-conf/jdbc-example.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<beans xmlns:amq="http://activemq.org/config/1.0">
-
-    <amq:broker brokerName="brokerJdbcConfigTest" persistent="false" useShutdownHook="false" deleteAllMessagesOnStartup="true">
-
-        <amq:transportConnectors>
-            <amq:transportConnector uri="tcp://localhost:61635"/>
-        </amq:transportConnectors>
-
-        <amq:persistenceAdapter>
-            <amq:jdbcPersistenceAdapter>
-                <property name="cleanupPeriod" value="60000"/>
-                <property name="dataSource" ref="embedded-ds"/>
-                <property name="wireFormat">
-                    <bean id="myWireFormat" class="org.activeio.command.DefaultWireFormat"/>
-                </property>
-            </amq:jdbcPersistenceAdapter>
-        </amq:persistenceAdapter>
-    </amq:broker>
-
-    <!-- ==================================================================== -->
-    <!-- JDBC DataSource Configurations -->
-    <!-- ==================================================================== -->
-
-    <!-- The Datasource that will be used by the Broker -->
-    <bean id="embedded-ds" class="org.apache.derby.jdbc.EmbeddedDataSource">
-        <property name="databaseName" value="testJdbcConfig"/>
-        <property name="createDatabase" value="create"/>
-    </bean>
-</beans>
diff --git a/assembly/src/sample-conf/jgroups/default.xml b/assembly/src/sample-conf/jgroups/default.xml
deleted file mode 100755
index 5058099e36..0000000000
--- a/assembly/src/sample-conf/jgroups/default.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-<!-- ************ JGroups Protocol Stack Configuration ************** -->
-<!-- generated by XmlConfigurator on Mon Apr 26 11:15:41 PDT 2004 -->
-<!-- input file: default.old.xml -->
-
-<config>
-  <UDP mcast_send_buf_size="32000" mcast_port="45566" ucast_recv_buf_size="64000" mcast_addr="228.8.8.8"
-    loopback="true" mcast_recv_buf_size="64000" max_bundle_size="60000" max_bundle_timeout="30"
-    use_incoming_packet_handler="false" use_outgoing_packet_handler="false" ucast_send_buf_size="32000"
-    ip_ttl="32" enable_bundling="false"/>
-  <PING timeout="2000" num_initial_members="3"/>
-  <MERGE2 max_interval="10000" min_interval="5000"/>
-  <FD timeout="2000" max_tries="3" shun="true"/>
-  <VERIFY_SUSPECT timeout="1500"/>
-  <pbcast.NAKACK max_xmit_size="8192" use_mcast_xmit="false" gc_lag="50" retransmit_timeout="600,1200,2400,4800"/>
-  <UNICAST timeout="1200,2400,3600"/>
-
-  <!--
-  - desired_avg_gossip: periodically sends STABLE messages around. 0 disables this
-  - max_bytes: max number of bytes received from anyone until a STABLE message is sent. Use either this or
-               desired_avg_gossip, but not both ! 0 disables it.
-  - stability_delay: range (number of milliseconds) that we wait until sending a STABILITY message.
-    This prevents STABILITY multicast storms. If max_bytes is used, this should be set to a low value (> 0 though !).
-  -->
-  <pbcast.STABLE stability_delay="1000" desired_avg_gossip="20000" max_bytes="0"/>
-  <FRAG frag_size="8192" down_thread="false" up_thread="false"/>
-  <pbcast.GMS print_local_addr="true" join_timeout="3000" join_retry_timeout="2000" shun="true"/>
-</config>
\ No newline at end of file
diff --git a/assembly/src/sample-conf/journal-example.xml b/assembly/src/sample-conf/journal-example.xml
deleted file mode 100755
index 3aa818052a..0000000000
--- a/assembly/src/sample-conf/journal-example.xml
+++ /dev/null
@@ -1,54 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<beans xmlns:amq="http://activemq.org/config/1.0">
-
-    <amq:broker brokerName="brokerJournalConfigTest" persistent="false" useShutdownHook="false" deleteAllMessagesOnStartup="true">
-
-        <amq:transportConnectors>
-            <amq:transportConnector uri="tcp://localhost:61635"/>
-        </amq:transportConnectors>
-
-        <amq:persistenceAdapter>
-            <amq:journalPersistenceAdapter>
-                <constructor-arg index="0">
-                    <ref bean="myJournalImpl"/>
-                </constructor-arg>
-
-                <constructor-arg index="1">
-                    <amq:jdbcPersistenceAdapter>
-                        <property name="cleanupPeriod" value="60000"/>
-                        <property name="dataSource" ref="embedded-ds"/>
-                        <property name="wireFormat">
-                            <bean id="myWireFormat" class="org.activeio.command.DefaultWireFormat"/>
-                        </property>
-                    </amq:jdbcPersistenceAdapter>
-                </constructor-arg>
-
-                <constructor-arg index="2">
-                    <amq:usageManager/>
-                </constructor-arg>
-
-                <constructor-arg index="3">
-                    <bean id="myTaskRunnerFactory" class="org.apache.activemq.thread.TaskRunnerFactory"/>
-                </constructor-arg>
-            </amq:journalPersistenceAdapter>
-        </amq:persistenceAdapter>
-    </amq:broker>
-
-    <!-- The journal implementation that will be used -->
-    <bean id="myJournalImpl" class="org.activeio.journal.active.JournalImpl">
-        <constructor-arg index="0">
-            <bean id="myFile" class="java.io.File">
-                <constructor-arg index="0">
-                    <value>target/test-data/testJournalConfig/journal</value>
-                </constructor-arg>
-            </bean>
-        </constructor-arg>
-    </bean>
-
-    <!-- The Datasource that will be used by the Broker -->
-    <bean id="embedded-ds" class="org.apache.derby.jdbc.EmbeddedDataSource">
-        <property name="databaseName" value="testJournalConfig/derbydb"/>
-        <property name="createDatabase" value="create"/>
-    </bean>
-</beans>
diff --git a/assembly/src/sample-conf/journaledjdbc-example.xml b/assembly/src/sample-conf/journaledjdbc-example.xml
deleted file mode 100644
index 6a086990c1..0000000000
--- a/assembly/src/sample-conf/journaledjdbc-example.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<beans xmlns:amq="http://activemq.org/config/1.0">
-
-    <amq:broker brokerName="brokerJournaledJDBCConfigTest" persistent="false" useShutdownHook="false" deleteAllMessagesOnStartup="true">
-
-        <amq:transportConnectors>
-            <amq:transportConnector uri="tcp://localhost:61635"/>
-        </amq:transportConnectors>
-
-        <amq:persistenceAdapter>
-            <amq:journaledJDBC journalLogFiles="4" journalLogFileSize="32768" dataDirectory="target/test-data/testJournaledJDBCConfig" />
-        </amq:persistenceAdapter>
-    </amq:broker>
-</beans>
diff --git a/assembly/src/sample-conf/memory-example.xml b/assembly/src/sample-conf/memory-example.xml
deleted file mode 100644
index 2cf0d07b2c..0000000000
--- a/assembly/src/sample-conf/memory-example.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<beans xmlns:amq="http://activemq.org/config/1.0">
-
-    <amq:broker brokerName="brokerMemoryConfigTest" persistent="false" useShutdownHook="false" deleteAllMessagesOnStartup="true">
-
-        <amq:transportConnectors>
-            <amq:transportConnector uri="tcp://localhost:61635"/>
-        </amq:transportConnectors>
-
-        <amq:persistenceAdapter>
-            <amq:memoryPersistenceAdapter init-method="createTransactionStore"/>
-        </amq:persistenceAdapter>
-    </amq:broker>
-</beans>
diff --git a/assembly/src/sample-conf/peer.xml b/assembly/src/sample-conf/peer.xml
deleted file mode 100755
index 557141ccc1..0000000000
--- a/assembly/src/sample-conf/peer.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE beans PUBLIC  "-//ACTIVEMQ//DTD//EN" "http://activemq.org/dtd/activemq.dtd">
-<beans>
-
-  <!--
-    || A simple peer based ActiveMQ Message Broker configuration
-    || where brokers are typically embedded in JMS clients and the
-    || brokers all auto-discover each other via Zeroconf
-    || (which requires multicast to be enabled)
-    ||
-    || If your network does not support multicast then its advisable
-    || to replace this mechansim with hard coded host names
-    -->
-
-  <broker>
-    <connector>
-      <tcpServerTransport uri="tcp://localhost:0"/>
-    </connector>
-
-    <discoveryAgent>
-      <zeroconfDiscovery type="_activemq.broker.development."/>
-    </discoveryAgent>
-
-    <discoveryNetworkConnector/>
-
-    <persistence>
-      <vmPersistence/>
-    </persistence>
-  </broker>
-</beans>
diff --git a/assembly/src/sample-conf/vm-example.xml b/assembly/src/sample-conf/vm-example.xml
deleted file mode 100755
index 343f9cdba9..0000000000
--- a/assembly/src/sample-conf/vm-example.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE beans PUBLIC  "-//ACTIVEMQ//DTD//EN" "http://activemq.org/dtd/activemq.dtd">
-<beans>
-
-  <!-- using VM persistence (i.e. no long term persistence) -->
-  <broker>
-    <connector>
-      <serverTransport uri="vm://localhost"/>
-    </connector>
-
-
-    <persistence>
-      <vmPersistence/>
-    </persistence>
-  </broker>
-
-</beans>