[jboss-cvs] JBossAS SVN: r111832 - in trunk: server/src/main/java/org/jboss/deployment and 2 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Tue Jul 26 03:13:15 EDT 2011
Author: jaikiran
Date: 2011-07-26 03:13:15 -0400 (Tue, 26 Jul 2011)
New Revision: 111832
Added:
trunk/system/src/main/java/org/jboss/system/server/deployment/
trunk/system/src/main/java/org/jboss/system/server/deployment/ExplicitDeclaredStructure.java
Removed:
trunk/server/src/main/java/org/jboss/deployment/ExplicitDeclaredStructure.java
Modified:
trunk/server/src/etc/conf/all/bootstrap/deployers.xml
Log:
JBAS-9422 Move the ExplicitDeclaredStructure to the system module since it's required by the minimal server too. Note that this class will be removed once we have a release of the new MC libraries
Modified: trunk/server/src/etc/conf/all/bootstrap/deployers.xml
===================================================================
--- trunk/server/src/etc/conf/all/bootstrap/deployers.xml 2011-07-25 17:28:45 UTC (rev 111831)
+++ trunk/server/src/etc/conf/all/bootstrap/deployers.xml 2011-07-26 07:13:15 UTC (rev 111832)
@@ -108,7 +108,7 @@
</bean>
<!-- A declared structure descriptor deployer -->
- <bean name="DeclaredStructure" class="org.jboss.deployment.ExplicitDeclaredStructure"/>
+ <bean name="DeclaredStructure" class="org.jboss.system.server.deployment.ExplicitDeclaredStructure"/>
<!-- JAR Structure -->
<bean name="JARStructure" class="org.jboss.deployers.vfs.plugins.structure.jar.JARStructure">
Deleted: trunk/server/src/main/java/org/jboss/deployment/ExplicitDeclaredStructure.java
===================================================================
--- trunk/server/src/main/java/org/jboss/deployment/ExplicitDeclaredStructure.java 2011-07-25 17:28:45 UTC (rev 111831)
+++ trunk/server/src/main/java/org/jboss/deployment/ExplicitDeclaredStructure.java 2011-07-26 07:13:15 UTC (rev 111832)
@@ -1,52 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2010, Red Hat, Inc., and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-
-package org.jboss.deployment;
-
-import org.jboss.deployers.vfs.plugins.structure.explicit.DeclaredStructure;
-import org.jboss.vfs.VirtualFile;
-import org.jboss.vfs.util.automount.Automounter;
-import org.jboss.vfs.util.automount.MountOption;
-
-import java.io.IOException;
-
-/**
- * This class is just here to fix a bug in {@link DeclaredStructure} where the {@link DeclaredStructure#performMount(org.jboss.vfs.VirtualFile)}
- * does <i>not</i> explode the .war files.
- * <p/>
- * Once the {@link DeclaredStructure} is fixed, we will no longer require this {@link ExplicitDeclaredStructure}
- * <p/>
- *
- * @see Related to https://issues.jboss.org/browse/JBAS-8786
- * User: Jaikiran Pai
- */
-public class ExplicitDeclaredStructure extends DeclaredStructure {
-
- @Override
- protected void performMount(VirtualFile file) throws IOException {
- if (file.getName().endsWith(".war")) {
- Automounter.mount(file, MountOption.EXPANDED, MountOption.COPY);
- return;
- }
- Automounter.mount(file, MountOption.COPY);
- }
-}
Added: trunk/system/src/main/java/org/jboss/system/server/deployment/ExplicitDeclaredStructure.java
===================================================================
--- trunk/system/src/main/java/org/jboss/system/server/deployment/ExplicitDeclaredStructure.java (rev 0)
+++ trunk/system/src/main/java/org/jboss/system/server/deployment/ExplicitDeclaredStructure.java 2011-07-26 07:13:15 UTC (rev 111832)
@@ -0,0 +1,52 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2010, Red Hat, Inc., and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+
+package org.jboss.system.server.deployment;
+
+import org.jboss.deployers.vfs.plugins.structure.explicit.DeclaredStructure;
+import org.jboss.vfs.VirtualFile;
+import org.jboss.vfs.util.automount.Automounter;
+import org.jboss.vfs.util.automount.MountOption;
+
+import java.io.IOException;
+
+/**
+ * This class is just here to fix a bug in {@link DeclaredStructure} where the {@link DeclaredStructure#performMount(org.jboss.vfs.VirtualFile)}
+ * does <i>not</i> explode the .war files.
+ * <p/>
+ * Once the {@link DeclaredStructure} is fixed, we will no longer require this {@link ExplicitDeclaredStructure}
+ * <p/>
+ *
+ * @see Related to https://issues.jboss.org/browse/JBAS-8786
+ * User: Jaikiran Pai
+ */
+public class ExplicitDeclaredStructure extends DeclaredStructure {
+
+ @Override
+ protected void performMount(VirtualFile file) throws IOException {
+ if (file.getName().endsWith(".war")) {
+ Automounter.mount(file, MountOption.EXPANDED, MountOption.COPY);
+ return;
+ }
+ Automounter.mount(file, MountOption.COPY);
+ }
+}
More information about the jboss-cvs-commits
mailing list