User: tobyallsopp
Date: 01/04/14 21:31:39
Modified: src/main/org/jboss/resource RARDeployer.java
RARDeployerMBean.java RARMetaData.java
Log:
- Reduced verbosity of deployment of RARs containing license terms
- Removed classes duplicated from the core - these are now in the
jboss-deployer.jar file
- Implemented getDeplyableFilter for the upcoming AutoDeployer enhancement
Revision Changes Path
1.2 +13 -1 jbosscx/src/main/org/jboss/resource/RARDeployer.java
Index: RARDeployer.java
===================================================================
RCS file: /cvsroot/jboss/jbosscx/src/main/org/jboss/resource/RARDeployer.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- RARDeployer.java 2001/02/06 06:54:40 1.1
+++ RARDeployer.java 2001/04/15 04:31:39 1.2
@@ -10,6 +10,7 @@
import java.io.FileFilter;
import java.io.FileInputStream;
import java.io.FileOutputStream;
+import java.io.FilenameFilter;
import java.io.IOException;
import java.io.InputStream;
import java.io.OutputStream;
@@ -47,7 +48,7 @@
* <code>ConnectionFactoryLoader</code> service.
*
* @author Toby Allsopp ([EMAIL PROTECTED])
- * @version $Revision: 1.1 $
+ * @version $Revision: 1.2 $
*
* @see org.jboss.resource.ConnectionFactoryLoader
*/
@@ -72,6 +73,17 @@
// Public --------------------------------------------------------
+ public FilenameFilter getDeployableFilter()
+ {
+ return new FilenameFilter()
+ {
+ public boolean accept(File dir, String filename)
+ {
+ return filename.endsWith(".rar");
+ }
+ };
+ }
+
// RARDeployerMBean implementation -------------------------------
// DeployerMBeanSupport overrides ---------------------------------
1.2 +3 -3 jbosscx/src/main/org/jboss/resource/RARDeployerMBean.java
Index: RARDeployerMBean.java
===================================================================
RCS file: /cvsroot/jboss/jbosscx/src/main/org/jboss/resource/RARDeployerMBean.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- RARDeployerMBean.java 2001/02/06 06:54:40 1.1
+++ RARDeployerMBean.java 2001/04/15 04:31:39 1.2
@@ -9,11 +9,11 @@
import org.jboss.deployment.DeployerMBean;
/**
- * <description>
+ * Exposed management interface for the <code>RARDeployer</code>
+ * service.
*
- * @see <related>
* @author Toby Allsopp ([EMAIL PROTECTED])
- * @version $Revision: 1.1 $
+ * @version $Revision: 1.2 $
*/
public interface RARDeployerMBean
extends DeployerMBean
1.3 +8 -12 jbosscx/src/main/org/jboss/resource/RARMetaData.java
Index: RARMetaData.java
===================================================================
RCS file: /cvsroot/jboss/jbosscx/src/main/org/jboss/resource/RARMetaData.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- RARMetaData.java 2001/02/08 05:08:19 1.2
+++ RARMetaData.java 2001/04/15 04:31:39 1.3
@@ -26,7 +26,7 @@
*
* @see RARDeployer
* @author Toby Allsopp ([EMAIL PROTECTED])
- * @version $Revision: 1.2 $
+ * @version $Revision: 1.3 $
*/
public class RARMetaData
// extends Y
@@ -325,17 +325,13 @@
"license-required");
Element descriptionE = MetaData.getOptionalChild(element,
"description");
- boolean required = new
Boolean(getElementContent(requiredE).trim()).booleanValue();
- if(required) {
- log.warning("By using this resource adapter, you are accepting the");
- log.warning("following license. If you object to the license, you");
- log.warning("must undeploy the resource adapter immediately.");
- log.warning(getElementContent(descriptionE).trim());
- } else {
- log.warning("This resource adapter has license terms that you may");
- log.warning("want to be aware of, though you are not required to");
- log.warning("accept them in order to use the adapter.");
- }
+ boolean required =
+ new Boolean(getElementContent(requiredE).trim()).booleanValue();
+ if(required)
+ log.warning("Required license terms present. See deployment " +
+ "descriptor.");
+ else
+ log.log("License terms present. See deployment descriptor.");
}
catch (org.jboss.ejb.DeploymentException de)
{
_______________________________________________
Jboss-development mailing list
[EMAIL PROTECTED]
http://lists.sourceforge.net/lists/listinfo/jboss-development
