Skip to content
This repository was archived by the owner on Apr 2, 2021. It is now read-only.

Commit a7f3fa5

Browse files
johndevsjohndevs
committed
Change namespace and plugin id
1 parent ee466e0 commit a7f3fa5

File tree

92 files changed

+296
-325
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

92 files changed

+296
-325
lines changed

‎build.gradle

+6-6
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ plugins {
3737
**********************************************************************************************************************/
3838

3939
defaultTasks 'jar'
40-
group = "fi.jasoft.plugin"
40+
group = "com.devsoap.plugin"
4141
version = project.hasProperty('BUILD_VERSION') ? getProperty('BUILD_VERSION') : 'SNAPSHOT-'+ new Date().format('yyyyMMdd')
4242
archivesBaseName ='gradle-vaadin-plugin'
4343
sourceCompatibility = 1.8
@@ -199,8 +199,8 @@ jar {
199199
task sourcesJar(type: Jar) {
200200
from sourceSets.main.allSource
201201
classifier = 'sources'
202-
include 'fi/**/*.groovy'
203-
include 'fi/**/*.java'
202+
include 'com/**/*.groovy'
203+
include 'com/**/*.java'
204204
}
205205

206206
/**
@@ -289,19 +289,19 @@ pluginBundle {
289289
tags = ['vaadin']
290290
plugins {
291291
vaadinPlugin {
292-
id = 'fi.jasoft.plugin.vaadin'
292+
id = 'com.devsoap.plugin.vaadin'
293293
displayName = 'Gradle Vaadin plugin'
294294
}
295295
vaadinGroovyPlugin {
296-
id = 'fi.jasoft.plugin.vaadin.groovy'
296+
id = 'com.devsoap.plugin.vaadin.groovy'
297297
displayName = 'Gradle Vaadin Groovy plugin'
298298
description = 'Build Vaadin applications with Groovy and Gradle!'
299299
tags = ['vaadin', 'groovy']
300300
}
301301
}
302302

303303
mavenCoordinates {
304-
groupId = 'fi.jasoft.plugin'
304+
groupId = 'com.devsoap.plugin'
305305
artifactId = 'gradle-vaadin-plugin'
306306
}
307307
}

‎src/ast/groovy/fi/jasoft/plugin/configuration/PluginConfiguration.groovy ‎src/ast/groovy/com/devsoap/plugin/configuration/PluginConfiguration.groovy

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
* See the License for the specific language governing permissions and
1414
* limitations under the License.
1515
*/
16-
package fi.jasoft.plugin.configuration
16+
package com.devsoap.plugin.configuration
1717

1818
import org.codehaus.groovy.ast.ASTNode
1919
import org.codehaus.groovy.ast.ClassNode

‎src/main/groovy/fi/jasoft/plugin/GradleVaadinGroovyPlugin.groovy ‎src/main/groovy/com/devsoap/plugin/GradleVaadinGroovyPlugin.groovy

+3-3
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,9 @@
1313
* See the License for the specific language governing permissions and
1414
* limitations under the License.
1515
*/
16-
package fi.jasoft.plugin
16+
package com.devsoap.plugin
1717

18-
import fi.jasoft.plugin.configuration.VaadinPluginGroovyExtension
18+
import com.devsoap.plugin.configuration.VaadinPluginGroovyExtension
1919
import org.gradle.api.Project
2020
import org.gradle.api.artifacts.Configuration
2121
import org.gradle.api.artifacts.ConfigurationContainer
@@ -32,7 +32,7 @@ class GradleVaadinGroovyPlugin extends GradleVaadinPlugin {
3232

3333
@Override
3434
static String getPluginId() {
35-
'fi.jasoft.plugin.vaadin.groovy'
35+
'com.devsoap.plugin.vaadin.groovy'
3636
}
3737

3838
@Override

‎src/main/groovy/fi/jasoft/plugin/GradleVaadinPlugin.groovy ‎src/main/groovy/com/devsoap/plugin/GradleVaadinPlugin.groovy

+39-40
Original file line numberDiff line numberDiff line change
@@ -13,42 +13,41 @@
1313
* See the License for the specific language governing permissions and
1414
* limitations under the License.
1515
*/
16-
package fi.jasoft.plugin
17-
18-
import fi.jasoft.plugin.actions.JavaPluginAction
19-
import fi.jasoft.plugin.actions.PluginAction
20-
import fi.jasoft.plugin.actions.SpringBootAction
21-
import fi.jasoft.plugin.actions.VaadinPluginAction
22-
import fi.jasoft.plugin.actions.WarPluginAction
23-
import fi.jasoft.plugin.configuration.TestBenchConfiguration
24-
import fi.jasoft.plugin.configuration.TestBenchHubConfiguration
25-
import fi.jasoft.plugin.configuration.TestBenchNodeConfiguration
26-
import fi.jasoft.plugin.configuration.VaadinPluginExtension
27-
import fi.jasoft.plugin.ides.EclipseUtil
28-
import fi.jasoft.plugin.ides.IDEAUtil
29-
import fi.jasoft.plugin.servers.ApplicationServer
30-
import fi.jasoft.plugin.tasks.BuildClassPathJar
31-
import fi.jasoft.plugin.tasks.BuildJavadocJarTask
32-
import fi.jasoft.plugin.tasks.BuildSourcesJarTask
33-
import fi.jasoft.plugin.tasks.CompileThemeTask
34-
import fi.jasoft.plugin.tasks.CompileWidgetsetTask
35-
import fi.jasoft.plugin.tasks.CompressCssTask
36-
import fi.jasoft.plugin.tasks.CreateAddonProjectTask
37-
import fi.jasoft.plugin.tasks.CreateAddonThemeTask
38-
import fi.jasoft.plugin.tasks.CreateComponentTask
39-
import fi.jasoft.plugin.tasks.CreateCompositeTask
40-
import fi.jasoft.plugin.tasks.CreateDesignTask
41-
import fi.jasoft.plugin.tasks.CreateDirectoryZipTask
42-
import fi.jasoft.plugin.tasks.CreateProjectTask
43-
import fi.jasoft.plugin.tasks.CreateTestbenchTestTask
44-
import fi.jasoft.plugin.tasks.CreateThemeTask
45-
import fi.jasoft.plugin.tasks.CreateWidgetsetGeneratorTask
46-
import fi.jasoft.plugin.tasks.DevModeTask
47-
import fi.jasoft.plugin.tasks.DirectorySearchTask
48-
import fi.jasoft.plugin.tasks.RunTask
49-
import fi.jasoft.plugin.tasks.SuperDevModeTask
50-
import fi.jasoft.plugin.tasks.UpdateAddonStylesTask
51-
import fi.jasoft.plugin.tasks.UpdateWidgetsetTask
16+
package com.devsoap.plugin
17+
18+
import com.devsoap.plugin.actions.JavaPluginAction
19+
import com.devsoap.plugin.actions.SpringBootAction
20+
import com.devsoap.plugin.actions.VaadinPluginAction
21+
import com.devsoap.plugin.actions.WarPluginAction
22+
import com.devsoap.plugin.configuration.TestBenchConfiguration
23+
import com.devsoap.plugin.configuration.TestBenchHubConfiguration
24+
import com.devsoap.plugin.configuration.TestBenchNodeConfiguration
25+
import com.devsoap.plugin.configuration.VaadinPluginExtension
26+
import com.devsoap.plugin.ides.EclipseUtil
27+
import com.devsoap.plugin.ides.IDEAUtil
28+
import com.devsoap.plugin.servers.ApplicationServer
29+
import com.devsoap.plugin.tasks.BuildClassPathJar
30+
import com.devsoap.plugin.tasks.BuildJavadocJarTask
31+
import com.devsoap.plugin.tasks.BuildSourcesJarTask
32+
import com.devsoap.plugin.tasks.CompileThemeTask
33+
import com.devsoap.plugin.tasks.CompileWidgetsetTask
34+
import com.devsoap.plugin.tasks.CompressCssTask
35+
import com.devsoap.plugin.tasks.CreateAddonProjectTask
36+
import com.devsoap.plugin.tasks.CreateAddonThemeTask
37+
import com.devsoap.plugin.tasks.CreateComponentTask
38+
import com.devsoap.plugin.tasks.CreateCompositeTask
39+
import com.devsoap.plugin.tasks.CreateDesignTask
40+
import com.devsoap.plugin.tasks.CreateDirectoryZipTask
41+
import com.devsoap.plugin.tasks.CreateProjectTask
42+
import com.devsoap.plugin.tasks.CreateTestbenchTestTask
43+
import com.devsoap.plugin.tasks.CreateThemeTask
44+
import com.devsoap.plugin.tasks.CreateWidgetsetGeneratorTask
45+
import com.devsoap.plugin.tasks.DevModeTask
46+
import com.devsoap.plugin.tasks.DirectorySearchTask
47+
import com.devsoap.plugin.tasks.RunTask
48+
import com.devsoap.plugin.tasks.SuperDevModeTask
49+
import com.devsoap.plugin.tasks.UpdateAddonStylesTask
50+
import com.devsoap.plugin.tasks.UpdateWidgetsetTask
5251
import org.gradle.api.Action
5352
import org.gradle.api.GradleException
5453
import org.gradle.api.InvalidUserDataException
@@ -139,7 +138,7 @@ class GradleVaadinPlugin implements Plugin<Project> {
139138
}
140139

141140
static String getPluginId() {
142-
'fi.jasoft.plugin.vaadin'
141+
'com.devsoap.plugin.vaadin'
143142
}
144143

145144
@Override
@@ -368,7 +367,7 @@ class GradleVaadinPlugin implements Plugin<Project> {
368367

369368
// Needed for server runners
370369
Dependency plugin = projectDependencies.create(
371-
"fi.jasoft.plugin:gradle-vaadin-plugin:${GradleVaadinPlugin.version}") {
370+
"com.devsoap.plugin:gradle-vaadin-plugin:${GradleVaadinPlugin.version}") {
372371
transitive = false
373372
}
374373

@@ -431,7 +430,7 @@ class GradleVaadinPlugin implements Plugin<Project> {
431430
dependencies.add(jettyAll)
432431

433432
Dependency plugin = projectDependencies.create(
434-
"fi.jasoft.plugin:gradle-vaadin-plugin:${GradleVaadinPlugin.version}")
433+
"com.devsoap.plugin:gradle-vaadin-plugin:${GradleVaadinPlugin.version}")
435434
dependencies.add(plugin)
436435

437436
Dependency asm = projectDependencies.create('org.ow2.asm:asm:5.0.3')
@@ -477,7 +476,7 @@ class GradleVaadinPlugin implements Plugin<Project> {
477476
dependencies.add(libsass)
478477

479478
Dependency plugin = projectDependencies.create(
480-
"fi.jasoft.plugin:gradle-vaadin-plugin:${GradleVaadinPlugin.version}")
479+
"com.devsoap.plugin:gradle-vaadin-plugin:${GradleVaadinPlugin.version}")
481480
dependencies.add(plugin)
482481
break
483482
default:

‎src/main/groovy/fi/jasoft/plugin/MessageLogger.groovy ‎src/main/groovy/com/devsoap/plugin/MessageLogger.groovy

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
* See the License for the specific language governing permissions and
1414
* limitations under the License.
1515
*/
16-
package fi.jasoft.plugin
16+
package com.devsoap.plugin
1717

1818
import groovy.transform.CompileStatic
1919
import org.gradle.util.SingleMessageLogger

‎src/main/groovy/fi/jasoft/plugin/TemplateUtil.groovy ‎src/main/groovy/com/devsoap/plugin/TemplateUtil.groovy

+1-2
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,9 @@
1313
* See the License for the specific language governing permissions and
1414
* limitations under the License.
1515
*/
16-
package fi.jasoft.plugin
16+
package com.devsoap.plugin
1717

1818
import groovy.text.SimpleTemplateEngine
19-
import groovy.text.Template
2019
import groovy.text.TemplateEngine
2120
import org.apache.commons.lang.StringUtils
2221
import org.gradle.api.Project

‎src/main/groovy/fi/jasoft/plugin/Util.groovy ‎src/main/groovy/com/devsoap/plugin/Util.groovy

+6-6
Original file line numberDiff line numberDiff line change
@@ -13,12 +13,12 @@
1313
* See the License for the specific language governing permissions and
1414
* limitations under the License.
1515
*/
16-
package fi.jasoft.plugin
16+
package com.devsoap.plugin
1717

18-
import fi.jasoft.plugin.configuration.PluginConfigurationName
19-
import fi.jasoft.plugin.configuration.VaadinPluginExtension
20-
import fi.jasoft.plugin.tasks.BuildClassPathJar
21-
import fi.jasoft.plugin.tasks.UpdateWidgetsetTask
18+
import com.devsoap.plugin.configuration.PluginConfigurationName
19+
import com.devsoap.plugin.configuration.VaadinPluginExtension
20+
import com.devsoap.plugin.tasks.BuildClassPathJar
21+
import com.devsoap.plugin.tasks.UpdateWidgetsetTask
2222
import groovy.io.FileType
2323
import groovy.transform.Memoized
2424
import groovyx.net.http.HTTPBuilder
@@ -1070,7 +1070,7 @@ class Util {
10701070
@Memoized
10711071
static VersionNumber getLatestReleaseVersion() {
10721072
try {
1073-
HTTPBuilder http = new HTTPBuilder('https://plugins.gradle.org/plugin/fi.jasoft.plugin.vaadin')
1073+
HTTPBuilder http = new HTTPBuilder('https://plugins.gradle.org/plugin/com.devsoap.plugin.vaadin')
10741074
def html = http.get([:])
10751075
def versionNode = html."**".find { it.text().startsWith('Version') }
10761076
if(versionNode){

‎src/main/groovy/fi/jasoft/plugin/actions/JavaPluginAction.groovy ‎src/main/groovy/com/devsoap/plugin/actions/JavaPluginAction.groovy

+14-14
Original file line numberDiff line numberDiff line change
@@ -13,20 +13,20 @@
1313
* See the License for the specific language governing permissions and
1414
* limitations under the License.
1515
*/
16-
package fi.jasoft.plugin.actions
17-
18-
import fi.jasoft.plugin.GradleVaadinPlugin
19-
20-
import fi.jasoft.plugin.TemplateUtil
21-
import fi.jasoft.plugin.Util
22-
import fi.jasoft.plugin.configuration.TestBenchConfiguration
23-
import fi.jasoft.plugin.configuration.TestBenchHubConfiguration
24-
import fi.jasoft.plugin.configuration.TestBenchNodeConfiguration
25-
import fi.jasoft.plugin.servers.ApplicationServer
26-
import fi.jasoft.plugin.tasks.CreateWidgetsetGeneratorTask
27-
import fi.jasoft.plugin.tasks.UpdateWidgetsetTask
28-
import fi.jasoft.plugin.testbench.TestbenchHub
29-
import fi.jasoft.plugin.testbench.TestbenchNode
16+
package com.devsoap.plugin.actions
17+
18+
import com.devsoap.plugin.GradleVaadinPlugin
19+
20+
import com.devsoap.plugin.TemplateUtil
21+
import com.devsoap.plugin.Util
22+
import com.devsoap.plugin.configuration.TestBenchConfiguration
23+
import com.devsoap.plugin.configuration.TestBenchHubConfiguration
24+
import com.devsoap.plugin.configuration.TestBenchNodeConfiguration
25+
import com.devsoap.plugin.servers.ApplicationServer
26+
import com.devsoap.plugin.tasks.CreateWidgetsetGeneratorTask
27+
import com.devsoap.plugin.tasks.UpdateWidgetsetTask
28+
import com.devsoap.plugin.testbench.TestbenchHub
29+
import com.devsoap.plugin.testbench.TestbenchNode
3030
import groovy.transform.PackageScope
3131
import org.gradle.api.Project
3232
import org.gradle.api.Task

‎src/main/groovy/fi/jasoft/plugin/actions/PluginAction.groovy ‎src/main/groovy/com/devsoap/plugin/actions/PluginAction.groovy

+3-3
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,10 @@
1313
* See the License for the specific language governing permissions and
1414
* limitations under the License.
1515
*/
16-
package fi.jasoft.plugin.actions
16+
package com.devsoap.plugin.actions
1717

18-
import fi.jasoft.plugin.GradleVaadinGroovyPlugin
19-
import fi.jasoft.plugin.GradleVaadinPlugin
18+
import com.devsoap.plugin.GradleVaadinGroovyPlugin
19+
import com.devsoap.plugin.GradleVaadinPlugin
2020
import org.gradle.api.Project
2121
import org.gradle.api.Task
2222
import org.gradle.api.execution.TaskExecutionListener

‎src/main/groovy/fi/jasoft/plugin/actions/SpringBootAction.groovy ‎src/main/groovy/com/devsoap/plugin/actions/SpringBootAction.groovy

+7-7
Original file line numberDiff line numberDiff line change
@@ -13,15 +13,15 @@
1313
* See the License for the specific language governing permissions and
1414
* limitations under the License.
1515
*/
16-
package fi.jasoft.plugin.actions
16+
package com.devsoap.plugin.actions
1717

18-
import fi.jasoft.plugin.GradleVaadinPlugin
18+
import com.devsoap.plugin.GradleVaadinPlugin
1919

20-
import fi.jasoft.plugin.Util
21-
import fi.jasoft.plugin.tasks.CompileThemeTask
22-
import fi.jasoft.plugin.tasks.CompileWidgetsetTask
23-
import fi.jasoft.plugin.tasks.CompressCssTask
24-
import fi.jasoft.plugin.tasks.RunTask
20+
import com.devsoap.plugin.Util
21+
import com.devsoap.plugin.tasks.CompileThemeTask
22+
import com.devsoap.plugin.tasks.CompileWidgetsetTask
23+
import com.devsoap.plugin.tasks.CompressCssTask
24+
import com.devsoap.plugin.tasks.RunTask
2525
import groovy.transform.PackageScope
2626
import org.gradle.api.Project
2727
import org.gradle.api.Task

‎src/main/groovy/fi/jasoft/plugin/actions/VaadinPluginAction.groovy ‎src/main/groovy/com/devsoap/plugin/actions/VaadinPluginAction.groovy

+3-3
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,10 @@
1313
* See the License for the specific language governing permissions and
1414
* limitations under the License.
1515
*/
16-
package fi.jasoft.plugin.actions
16+
package com.devsoap.plugin.actions
1717

18-
import fi.jasoft.plugin.GradleVaadinPlugin
19-
import fi.jasoft.plugin.tasks.CreateDirectoryZipTask
18+
import com.devsoap.plugin.GradleVaadinPlugin
19+
import com.devsoap.plugin.tasks.CreateDirectoryZipTask
2020
import groovy.transform.PackageScope
2121
import org.gradle.api.Project
2222
import org.gradle.api.Task

‎src/main/groovy/fi/jasoft/plugin/actions/WarPluginAction.groovy ‎src/main/groovy/com/devsoap/plugin/actions/WarPluginAction.groovy

+4-4
Original file line numberDiff line numberDiff line change
@@ -13,11 +13,11 @@
1313
* See the License for the specific language governing permissions and
1414
* limitations under the License.
1515
*/
16-
package fi.jasoft.plugin.actions
16+
package com.devsoap.plugin.actions
1717

18-
import fi.jasoft.plugin.Util
19-
import fi.jasoft.plugin.tasks.CompileThemeTask
20-
import fi.jasoft.plugin.tasks.CompileWidgetsetTask
18+
import com.devsoap.plugin.Util
19+
import com.devsoap.plugin.tasks.CompileThemeTask
20+
import com.devsoap.plugin.tasks.CompileWidgetsetTask
2121
import groovy.transform.PackageScope
2222
import org.gradle.api.Project
2323
import org.gradle.api.Task

‎src/main/groovy/fi/jasoft/plugin/configuration/AddonConfiguration.groovy ‎src/main/groovy/com/devsoap/plugin/configuration/AddonConfiguration.groovy

+3-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,9 @@
1313
* See the License for the specific language governing permissions and
1414
* limitations under the License.
1515
*/
16-
package fi.jasoft.plugin.configuration
16+
package com.devsoap.plugin.configuration
17+
18+
import com.devsoap.plugin.configuration.PluginConfiguration
1719

1820
/**
1921
* Configuration options for addon projects

‎src/main/groovy/fi/jasoft/plugin/configuration/ApplicationServerConfiguration.groovy ‎src/main/groovy/com/devsoap/plugin/configuration/ApplicationServerConfiguration.groovy

+3-2
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,10 @@
1313
* See the License for the specific language governing permissions and
1414
* limitations under the License.
1515
*/
16-
package fi.jasoft.plugin.configuration
16+
package com.devsoap.plugin.configuration
1717

18-
import fi.jasoft.plugin.tasks.RunTask
18+
import com.devsoap.plugin.configuration.PluginConfiguration
19+
import com.devsoap.plugin.tasks.RunTask
1920

2021
/**
2122
* Configuration class for configuring the Application Server

‎src/main/groovy/fi/jasoft/plugin/configuration/CompileThemeConfiguration.groovy ‎src/main/groovy/com/devsoap/plugin/configuration/CompileThemeConfiguration.groovy

+3-2
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,10 @@
1313
* See the License for the specific language governing permissions and
1414
* limitations under the License.
1515
*/
16-
package fi.jasoft.plugin.configuration
16+
package com.devsoap.plugin.configuration
1717

18-
import fi.jasoft.plugin.tasks.CompileThemeTask
18+
import com.devsoap.plugin.configuration.PluginConfiguration
19+
import com.devsoap.plugin.tasks.CompileThemeTask
1920

2021
/**
2122
* Configuration for the SASS Compiler

‎src/main/groovy/fi/jasoft/plugin/configuration/CompileWidgetsetConfiguration.groovy ‎src/main/groovy/com/devsoap/plugin/configuration/CompileWidgetsetConfiguration.groovy

+3-2
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,10 @@
1313
* See the License for the specific language governing permissions and
1414
* limitations under the License.
1515
*/
16-
package fi.jasoft.plugin.configuration
16+
package com.devsoap.plugin.configuration
1717

18-
import fi.jasoft.plugin.tasks.CompileWidgetsetTask
18+
import com.devsoap.plugin.configuration.PluginConfiguration
19+
import com.devsoap.plugin.tasks.CompileWidgetsetTask
1920

2021
/**
2122
* Created by john on 3/7/16.

‎src/main/groovy/fi/jasoft/plugin/configuration/DevModeConfiguration.groovy ‎src/main/groovy/com/devsoap/plugin/configuration/DevModeConfiguration.groovy

+3-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
1-
package fi.jasoft.plugin.configuration
1+
package com.devsoap.plugin.configuration
22

3-
import fi.jasoft.plugin.tasks.DevModeTask
3+
import com.devsoap.plugin.configuration.PluginConfiguration
4+
import com.devsoap.plugin.tasks.DevModeTask
45

56
/**
67
* Created by john on 4/2/17.

0 commit comments

Comments
 (0)