web-console-server支持quercus

Author: junphine

modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java

@@ -44,7 +44,6 @@
 import java.util.concurrent.atomic.AtomicReference;
 import javax.cache.CacheException;
 import org.apache.ignite.DataRegionMetrics;
-import org.apache.ignite.DataRegionMetricsAdapter;
 import org.apache.ignite.Ignite;
 import org.apache.ignite.IgniteAtomicLong;
 import org.apache.ignite.IgniteAtomicReference;

modules/igfs/pom.xml

@@ -44,6 +44,10 @@
             <groupId>org.apache.ignite</groupId>
             <artifactId>ignite-core</artifactId>      
         </dependency>
+        <dependency>
+            <groupId>org.apache.ignite</groupId>
+            <artifactId>ignite-slf4j</artifactId>
+        </dependency>
         <dependency>
             <groupId>${project.groupId}</groupId>
             <artifactId>ignite-codegen</artifactId>

…l/processors/rest/igfs/model/Bucket.java …ite/internal/rest/igfs/model/Bucket.javamodules/vertx-rest/src/main/java/org/apache/ignite/internal/processors/rest/igfs/model/Bucket.java renamed to modules/igfs/src/main/java/org/apache/ignite/internal/rest/igfs/model/Bucket.java modules/vertx-rest/src/main/java/org/apache/ignite/internal/processors/rest/igfs/model/Bucket.java renamed to modules/igfs/src/main/java/org/apache/ignite/internal/rest/igfs/model/Bucket.java

@@ -1,4 +1,4 @@
-package org.apache.ignite.internal.processors.rest.igfs.model;
+package org.apache.ignite.internal.rest.igfs.model;
 
 
 public class Bucket {

…/igfs/model/CompleteMultipartUpload.java …/igfs/model/CompleteMultipartUpload.javamodules/vertx-rest/src/main/java/org/apache/ignite/internal/processors/rest/igfs/model/CompleteMultipartUpload.java renamed to modules/igfs/src/main/java/org/apache/ignite/internal/rest/igfs/model/CompleteMultipartUpload.java modules/vertx-rest/src/main/java/org/apache/ignite/internal/processors/rest/igfs/model/CompleteMultipartUpload.java renamed to modules/igfs/src/main/java/org/apache/ignite/internal/rest/igfs/model/CompleteMultipartUpload.java

@@ -1,4 +1,4 @@
-package org.apache.ignite.internal.processors.rest.igfs.model;
+package org.apache.ignite.internal.rest.igfs.model;
 
 import java.util.List;
 

…model/CompleteMultipartUploadResult.java …model/CompleteMultipartUploadResult.javamodules/vertx-rest/src/main/java/org/apache/ignite/internal/processors/rest/igfs/model/CompleteMultipartUploadResult.java renamed to modules/igfs/src/main/java/org/apache/ignite/internal/rest/igfs/model/CompleteMultipartUploadResult.java modules/vertx-rest/src/main/java/org/apache/ignite/internal/processors/rest/igfs/model/CompleteMultipartUploadResult.java renamed to modules/igfs/src/main/java/org/apache/ignite/internal/rest/igfs/model/CompleteMultipartUploadResult.java

@@ -1,4 +1,4 @@
-package org.apache.ignite.internal.processors.rest.igfs.model;
+package org.apache.ignite.internal.rest.igfs.model;
 
 public class CompleteMultipartUploadResult {
     private String bucketName;

…t/igfs/model/DatasetSnapshotContext.java …t/igfs/model/DatasetSnapshotContext.javamodules/vertx-rest/src/main/java/org/apache/ignite/internal/processors/rest/igfs/model/DatasetSnapshotContext.java renamed to modules/igfs/src/main/java/org/apache/ignite/internal/rest/igfs/model/DatasetSnapshotContext.java modules/vertx-rest/src/main/java/org/apache/ignite/internal/processors/rest/igfs/model/DatasetSnapshotContext.java renamed to modules/igfs/src/main/java/org/apache/ignite/internal/rest/igfs/model/DatasetSnapshotContext.java

@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.ignite.internal.processors.rest.igfs.model;
+package org.apache.ignite.internal.rest.igfs.model;
 
 /**
  * The context that will be passed to the dataset provider when saving a snapshot of a versioned dataset.

…model/InitiateMultipartUploadResult.java …model/InitiateMultipartUploadResult.javamodules/vertx-rest/src/main/java/org/apache/ignite/internal/processors/rest/igfs/model/InitiateMultipartUploadResult.java renamed to modules/igfs/src/main/java/org/apache/ignite/internal/rest/igfs/model/InitiateMultipartUploadResult.java modules/vertx-rest/src/main/java/org/apache/ignite/internal/processors/rest/igfs/model/InitiateMultipartUploadResult.java renamed to modules/igfs/src/main/java/org/apache/ignite/internal/rest/igfs/model/InitiateMultipartUploadResult.java

@@ -1,4 +1,4 @@
-package org.apache.ignite.internal.processors.rest.igfs.model;
+package org.apache.ignite.internal.rest.igfs.model;
 
 public class InitiateMultipartUploadResult {
     private String bucket;

…s/rest/igfs/model/ListBucketsResult.java …l/rest/igfs/model/ListBucketsResult.javamodules/vertx-rest/src/main/java/org/apache/ignite/internal/processors/rest/igfs/model/ListBucketsResult.java renamed to modules/igfs/src/main/java/org/apache/ignite/internal/rest/igfs/model/ListBucketsResult.java modules/vertx-rest/src/main/java/org/apache/ignite/internal/processors/rest/igfs/model/ListBucketsResult.java renamed to modules/igfs/src/main/java/org/apache/ignite/internal/rest/igfs/model/ListBucketsResult.java

@@ -1,4 +1,4 @@
-package org.apache.ignite.internal.processors.rest.igfs.model;
+package org.apache.ignite.internal.rest.igfs.model;
 
 import java.util.List;
 

…sors/rest/igfs/model/ObjectMetadata.java …rnal/rest/igfs/model/ObjectMetadata.javamodules/vertx-rest/src/main/java/org/apache/ignite/internal/processors/rest/igfs/model/ObjectMetadata.java renamed to modules/igfs/src/main/java/org/apache/ignite/internal/rest/igfs/model/ObjectMetadata.java modules/vertx-rest/src/main/java/org/apache/ignite/internal/processors/rest/igfs/model/ObjectMetadata.java renamed to modules/igfs/src/main/java/org/apache/ignite/internal/rest/igfs/model/ObjectMetadata.java

@@ -1,4 +1,4 @@
-package org.apache.ignite.internal.processors.rest.igfs.model;
+package org.apache.ignite.internal.rest.igfs.model;
 
 import java.util.Date;
 import java.util.HashMap;

…processors/rest/igfs/model/PartETag.java …e/internal/rest/igfs/model/PartETag.javamodules/vertx-rest/src/main/java/org/apache/ignite/internal/processors/rest/igfs/model/PartETag.java renamed to modules/igfs/src/main/java/org/apache/ignite/internal/rest/igfs/model/PartETag.java modules/vertx-rest/src/main/java/org/apache/ignite/internal/processors/rest/igfs/model/PartETag.java renamed to modules/igfs/src/main/java/org/apache/ignite/internal/rest/igfs/model/PartETag.java

@@ -1,4 +1,4 @@
-package org.apache.ignite.internal.processors.rest.igfs.model;
+package org.apache.ignite.internal.rest.igfs.model;
 
 public class PartETag {
     private int partNumber;