Skip to content

Commit

Permalink
Interim fix until #461 is addressed
Browse files Browse the repository at this point in the history
  • Loading branch information
@gashcrumb
gashcrumb committed Aug 7, 2013
1 parent 50be5e7 commit 7b37116
Show file tree
Hide file tree
Showing 10 changed files with 52 additions and 25 deletions.
16 changes: 11 additions & 5 deletions hawtio-json-schema-generator/hawtio-json-schema-generator-test/pom.xml
View file
Expand Up @@ -100,18 +100,24 @@
<org.fusesource.fabric.api.CreateChildContainerOptions>
${project.build.outputDirectory}/webapp/fabric/js/createContainerChildOptions.js
</org.fusesource.fabric.api.CreateChildContainerOptions>
<org.fusesource.fabric.api.CreateSshContainerOptions>
<org.fusesource.fabric.service.ssh.CreateSshContainerOptions>
${project.build.outputDirectory}/webapp/fabric/js/createSshContainerOptions.js
</org.fusesource.fabric.api.CreateSshContainerOptions>
<org.fusesource.fabric.api.CreateJCloudsContainerOptions>
</org.fusesource.fabric.service.ssh.CreateSshContainerOptions>
<org.fusesource.fabric.service.jclouds.CreateJCloudsContainerOptions>
${project.build.outputDirectory}/webapp/fabric/js/createJcloudsContainerOptions.js
</org.fusesource.fabric.api.CreateJCloudsContainerOptions>
</org.fusesource.fabric.service.jclouds.CreateJCloudsContainerOptions>
</classes>
</configuration>
<dependencies>
<dependency>
<groupId>org.fusesource.fabric</groupId>
<artifactId>fabric-core</artifactId>
<artifactId>fabric-core-agent-ssh</artifactId>
<version>${fabric-version}</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.fusesource.fabric</groupId>
<artifactId>fabric-core-agent-jclouds</artifactId>
<version>${fabric-version}</version>
<scope>compile</scope>
</dependency>
Expand Down
6 changes: 3 additions & 3 deletions ...o-json-schema-generator/hawtio-json-schema-generator-test/src/test/resources/test-pom.xml
View file
Expand Up @@ -20,7 +20,7 @@

<dependency>
<groupId>org.fusesource.fabric</groupId>
<artifactId>fabric-core</artifactId>
<artifactId>fabric-core-agent-ssh</artifactId>
<version>${fabric-version}</version>
<scope>compile</scope>
</dependency>
Expand All @@ -42,9 +42,9 @@
<version>${project.version}</version>
<configuration>
<classes>
<org.fusesource.fabric.api.CreateSshContainerOptions>
<org.fusesource.fabric.service.ssh.CreateSshContainerOptions>
createSshContainerOptions.json
</org.fusesource.fabric.api.CreateSshContainerOptions>
</org.fusesource.fabric.service.ssh.CreateSshContainerOptions>
</classes>
</configuration>
<dependencies>
Expand Down
6 changes: 6 additions & 0 deletions hawtio-json-schema-mbean/pom.xml
View file
Expand Up @@ -100,6 +100,12 @@
<version>${fabric-version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.fusesource.fabric</groupId>
<artifactId>fabric-core-agent-ssh</artifactId>
<version>${fabric-version}</version>
<scope>test</scope>
</dependency>


<!--
Expand Down
2 changes: 1 addition & 1 deletion hawtio-json-schema-mbean/src/test/java/io/hawt/jsonschema/test/SchemaLookupTest.java
View file
Expand Up @@ -19,7 +19,7 @@ public void testLookupSchema() throws Exception {
@Test
public void testLookupMoreInterestingSchema() throws Exception {
SchemaLookup lookup = createSchemaLookup();
String result = lookup.getSchemaForClass("org.fusesource.fabric.api.CreateSshContainerOptions");
String result = lookup.getSchemaForClass("org.fusesource.fabric.service.ssh.CreateSshContainerOptions");
System.out.println("testLookupMoreInterestingSchema - Got: \n\n" + result + "\n\n");
}

Expand Down
20 changes: 16 additions & 4 deletions hawtio-web/pom.xml
View file
Expand Up @@ -418,12 +418,12 @@
<org.fusesource.fabric.api.CreateChildContainerOptions>
${schema-outdir}/createChildContainerOptions.js
</org.fusesource.fabric.api.CreateChildContainerOptions>
<org.fusesource.fabric.api.CreateSshContainerOptions>
<org.fusesource.fabric.service.ssh.CreateSshContainerOptions>
${schema-outdir}/createSshContainerOptions.js
</org.fusesource.fabric.api.CreateSshContainerOptions>
<org.fusesource.fabric.api.CreateJCloudsContainerOptions>
</org.fusesource.fabric.service.ssh.CreateSshContainerOptions>
<org.fusesource.fabric.service.jclouds.CreateJCloudsContainerOptions>
${schema-outdir}/createJcloudsContainerOptions.js
</org.fusesource.fabric.api.CreateJCloudsContainerOptions>
</org.fusesource.fabric.service.jclouds.CreateJCloudsContainerOptions>
<io.hawt.dozer.schema.Mappings>
${schema-outdir}/dozerMappings.js
</io.hawt.dozer.schema.Mappings>
Expand All @@ -439,6 +439,18 @@
</classes>
</configuration>
<dependencies>
<dependency>
<groupId>org.fusesource.fabric</groupId>
<artifactId>fabric-core-agent-ssh</artifactId>
<version>${fabric-version}</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.fusesource.fabric</groupId>
<artifactId>fabric-core-agent-jclouds</artifactId>
<version>${fabric-version}</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.fusesource.fabric</groupId>
<artifactId>fabric-core</artifactId>
Expand Down
4 changes: 2 additions & 2 deletions hawtio-web/src/main/d.ts/schemas.d.ts
View file
Expand Up @@ -4,5 +4,5 @@ declare var io_hawt_dozer_schema_Mapping: any;
declare var io_hawt_dozer_schema_Mappings: any;

declare var org_fusesource_fabric_api_CreateChildContainerOptions: any;
declare var org_fusesource_fabric_api_CreateJCloudsContainerOptions: any;
declare var org_fusesource_fabric_api_CreateSshContainerOptions: any;
declare var org_fusesource_fabric_service_jclouds_CreateJCloudsContainerOptions: any;
declare var org_fusesource_fabric_service_ssh_CreateSshContainerOptions: any;
8 changes: 4 additions & 4 deletions hawtio-web/src/main/webapp/app/fabric/html/createContainer.html
View file
Expand Up @@ -8,10 +8,10 @@
<button ng-switch-when='org_fusesource_fabric_api_CreateChildContainerOptions' class='btn pull-right' ng-href="" hawtio-submit='create_child_container'
ng-disabled="!forms.create_child_container.$valid">
<i class="icon-ok"></i> Create Child Container</button>
<button ng-switch-when='org_fusesource_fabric_api_CreateSshContainerOptions' class='btn pull-right' ng-href="" hawtio-submit='create_ssh_container'
<button ng-switch-when='org_fusesource_fabric_service_ssh_CreateSshContainerOptions' class='btn pull-right' ng-href="" hawtio-submit='create_ssh_container'
ng-disabled="!forms.create_ssh_container.$valid">
<i class="icon-ok"></i> Create SSH Container</button>
<button ng-switch-when='org_fusesource_fabric_api_CreateJCloudsContainerOptions' class='btn pull-right' ng-href="" hawtio-submit='create_cloud_container'
<button ng-switch-when='org_fusesource_fabric_service_jclouds_CreateJCloudsContainerOptions' class='btn pull-right' ng-href="" hawtio-submit='create_cloud_container'
ng-disabled="!forms.create_cloud_container.$valid">
<i class="icon-ok"></i> Create JCloud Container</button>
</div>
Expand All @@ -24,10 +24,10 @@
<div class="tab-pane" title="Child Container" value='org_fusesource_fabric_api_CreateChildContainerOptions'>
<div simple-form name='create_child_container' data='schema' entity='entity'></div>
</div>
<div class="tab-pane" title="SSH Container" value='org_fusesource_fabric_api_CreateSshContainerOptions'>
<div class="tab-pane" title="SSH Container" value='org_fusesource_fabric_service_ssh_CreateSshContainerOptions'>
<div simple-form name='create_ssh_container' data='schema' entity='entity'></div>
</div>
<div class="tab-pane" title="Cloud Container" value='org_fusesource_fabric_api_CreateJCloudsContainerOptions'>
<div class="tab-pane" title="Cloud Container" value='org_fusesource_fabric_service_jclouds_CreateJCloudsContainerOptions'>
<div simple-form name='create_cloud_container' data='schema' entity='entity'></div>
</div>
</div>
Expand Down
8 changes: 4 additions & 4 deletions hawtio-web/src/main/webapp/app/fabric/js/createContainer.ts
View file
Expand Up @@ -34,10 +34,10 @@ module Fabric {
$scope.activeTab = 'org_fusesource_fabric_api_CreateChildContainerOptions';
break;
case 'ssh':
$scope.activeTab = 'org_fusesource_fabric_api_CreateSshContainerOptions';
$scope.activeTab = 'org_fusesource_fabric_service_ssh_CreateSshContainerOptions';
break;
case 'cloud':
$scope.activeTab = 'org_fusesource_fabric_api_CreateJCloudsContainerOptions';
$scope.activeTab = 'org_fusesource_fabric_service_jclouds_CreateJCloudsContainerOptions';
break;
default:
$scope.activeTab = 'org_fusesource_fabric_api_CreateChildContainerOptions';
Expand Down Expand Up @@ -123,12 +123,12 @@ module Fabric {

break;

case 'org_fusesource_fabric_api_CreateSshContainerOptions':
case 'org_fusesource_fabric_service_ssh_CreateSshContainerOptions':
$scope.entity['providerType'] = 'ssh';
$location.search('tab', 'ssh');
break;

case 'org_fusesource_fabric_api_CreateJCloudsContainerOptions':
case 'org_fusesource_fabric_service_jclouds_CreateJCloudsContainerOptions':
$scope.entity['providerType'] = 'jclouds';
$location.search('tab', 'cloud');
break;
Expand Down
4 changes: 2 additions & 2 deletions hawtio-web/src/main/webapp/app/fabric/js/schemaConfigure.ts
View file
Expand Up @@ -2,8 +2,8 @@ module Fabric {


export var createChildContainerOptions = (<any>window).org_fusesource_fabric_api_CreateChildContainerOptions;
export var createJCloudsContainerOptions = (<any>window).org_fusesource_fabric_api_CreateJCloudsContainerOptions;
export var createSshContainerOptions = (<any>window).org_fusesource_fabric_api_CreateSshContainerOptions;
export var createJCloudsContainerOptions = (<any>window).org_fusesource_fabric_service_jclouds_CreateJCloudsContainerOptions;
export var createSshContainerOptions = (<any>window).org_fusesource_fabric_service_ssh_CreateSshContainerOptions;
export var createEnsembleOptions = (<any>window).org_fusesource_fabric_api_CreateEnsembleOptions;

export var createContainerSchemas:any = [Fabric.createChildContainerOptions, Fabric.createJCloudsContainerOptions, Fabric.createSshContainerOptions];
Expand Down
3 changes: 3 additions & 0 deletions pom.xml
View file
Expand Up @@ -77,7 +77,10 @@
<dozer-version>5.4.0</dozer-version>
<exec-maven-plugin-version>1.2.1</exec-maven-plugin-version>

<!--
<fabric-version>7.3.0.redhat-${perfectus-number}</fabric-version>
-->
<fabric-version>99-master-SNAPSHOT</fabric-version>
<fmc-version>${fabric-version}</fmc-version>

<!-- We are using an old guava to avoid breaking ActiveMQ in the test cases of hawtio-web -->
Expand Down

0 comments on commit 7b37116

Please sign in to comment.