add support for non java integrations

README.md

@@ -55,10 +55,16 @@ For Minishift, this means executing `oc login -u system:admin` then `kamel insta
 After the initial setup, you can run a Camel integration on the cluster executing:
 
 ```
-kamel run Sample.java
+kamel run runtime/examples/Sample.java
 ```
 
-A "Sample.java" file is included in the root of this repository. You can change the content of the file and execute the command again to see the changes.
+A "Sample.java" file is included in the folder runtime/examples of this repository. You can change the content of the file and execute the command again to see the changes.
+
+A JavaScript integration has also been provided as example, to run it:
+
+```
+kamel run runtime/examples/routes.js
+```
 
 ### Monitoring the Status
 

pkg/apis/camel/v1alpha1/types.go

@@ -45,7 +45,9 @@ type IntegrationSpec struct {
 }
 
 type SourceSpec struct {
-	Code *string `json:"code,omitempty"`
+	Name     *string `json:"name,omitempty"`
+	Content  *string `json:"content,omitempty"`
+	Language *string `json:"language,omitempty"`
 }
 
 type IntegrationStatus struct {

pkg/build/api/types.go

@@ -20,14 +20,19 @@ package api
 // a request to build a specific code
 type BuildSource struct {
 	Identifier BuildIdentifier
-	Code       string
+	Code       Code
 }
 
 type BuildIdentifier struct {
 	Name   string
 	Digest string
 }
 
+type Code struct {
+	Name    string
+	Content string
+}
+
 // represents the result of a build
 type BuildResult struct {
 	Source *BuildSource

pkg/build/build_manager_integration_test.go

@@ -21,12 +21,13 @@ package build
 
 import (
 	"context"
+	"testing"
+	"time"
+
 	build "github.com/apache/camel-k/pkg/build/api"
 	"github.com/apache/camel-k/pkg/util/digest"
 	"github.com/apache/camel-k/pkg/util/test"
 	"github.com/stretchr/testify/assert"
-	"testing"
-	"time"
 )
 
 func TestBuild(t *testing.T) {
@@ -38,7 +39,9 @@ func TestBuild(t *testing.T) {
 	}
 	buildManager.Start(build.BuildSource{
 		Identifier: identifier,
-		Code:       code(),
+		Code: build.Code{
+			Content: code(),
+		},
 	})
 
 	deadline := time.Now().Add(5 * time.Minute)
@@ -66,7 +69,9 @@ func TestFailedBuild(t *testing.T) {
 	}
 	buildManager.Start(build.BuildSource{
 		Identifier: identifier,
-		Code:       code() + "XX",
+		Code: build.Code{
+			Content: code() + "XX",
+		},
 	})
 
 	deadline := time.Now().Add(5 * time.Minute)

pkg/build/local/local_builder.go

@@ -127,12 +127,12 @@ func (b *localBuilder) execute(source build.BuildSource) (string, error) {
 				},
 			},
 		},
-		JavaSources: map[string]string{
-			"kamel/Routes.java": source.Code,
+		Resources: map[string]string{
+			source.Code.Name: source.Code.Content,
 		},
 		Env: map[string]string{
 			"JAVA_MAIN_CLASS":    "org.apache.camel.k.jvm.Application",
-			"CAMEL_K_ROUTES_URI": "classpath:kamel.Routes",
+			"CAMEL_K_ROUTES_URI": "classpath:" + source.Code.Name,
 		},
 	}
 

pkg/build/local/local_builder_integration_test.go

@@ -21,11 +21,12 @@ package local
 
 import (
 	"context"
+	"testing"
+
 	build "github.com/apache/camel-k/pkg/build/api"
 	"github.com/apache/camel-k/pkg/util/digest"
 	"github.com/apache/camel-k/pkg/util/test"
 	"github.com/stretchr/testify/assert"
-	"testing"
 )
 
 func TestBuild(t *testing.T) {
@@ -38,7 +39,9 @@ func TestBuild(t *testing.T) {
 			Name:   "test0",
 			Digest: digest.Random(),
 		},
-		Code: code(),
+		Code: build.Code{
+			Content: code(),
+		},
 	})
 
 	res := <-execution
@@ -56,15 +59,19 @@ func TestDoubleBuild(t *testing.T) {
 			Name:   "test1",
 			Digest: digest.Random(),
 		},
-		Code: code(),
+		Code: build.Code{
+			Content: code(),
+		},
 	})
 
 	execution2 := builder.Build(build.BuildSource{
 		Identifier: build.BuildIdentifier{
 			Name:   "test2",
 			Digest: digest.Random(),
 		},
-		Code: code(),
+		Code: build.Code{
+			Content: code(),
+		},
 	})
 
 	res1 := <-execution1
@@ -84,7 +91,9 @@ func TestFailedBuild(t *testing.T) {
 			Name:   "test3",
 			Digest: digest.Random(),
 		},
-		Code: code() + "-",
+		Code: build.Code{
+			Content: code() + "-",
+		},
 	})
 
 	res := <-execution

pkg/client/cmd/run.go

@@ -23,6 +23,7 @@ import (
 	"io/ioutil"
 	"os"
 	"strconv"
+	"strings"
 
 	"github.com/apache/camel-k/pkg/apis/camel/v1alpha1"
 	"github.com/apache/camel-k/pkg/util/kubernetes"
@@ -81,6 +82,11 @@ func (o *RunCmdOptions) run(cmd *cobra.Command, args []string) error {
 		name = "integration"
 	}
 
+	codeName := args[0]
+	if idx := strings.LastIndexByte(args[0], os.PathSeparator); idx > -1 {
+		codeName = codeName[idx:]
+	}
+
 	integration := v1alpha1.Integration{
 		TypeMeta: v1.TypeMeta{
 			Kind:       "Integration",
@@ -92,7 +98,9 @@ func (o *RunCmdOptions) run(cmd *cobra.Command, args []string) error {
 		},
 		Spec: v1alpha1.IntegrationSpec{
 			Source: v1alpha1.SourceSpec{
-				Code: &code,
+				Name:     &codeName,
+				Content:  &code,
+				Language: &o.Language,
 			},
 		},
 	}

pkg/stub/action/integration/build.go

@@ -54,7 +54,10 @@ func (b *BuildAction) Handle(integration *v1alpha1.Integration) error {
 	if buildResult.Status == api.BuildStatusNotRequested {
 		b.buildManager.Start(api.BuildSource{
 			Identifier: buildIdentifier,
-			Code:       *integration.Spec.Source.Code, // FIXME possible panic
+			Code: api.Code{
+				Name:    *integration.Spec.Source.Name,
+				Content: *integration.Spec.Source.Content,
+			}, // FIXME possible panic
 		})
 		logrus.Info("Build started")
 	} else if buildResult.Status == api.BuildStatusError {

pkg/util/digest/digest.go

@@ -20,10 +20,11 @@ package digest
 import (
 	"crypto/sha256"
 	"encoding/base64"
-	"github.com/apache/camel-k/pkg/apis/camel/v1alpha1"
-	"github.com/apache/camel-k/version"
 	"math/rand"
 	"strconv"
+
+	"github.com/apache/camel-k/pkg/apis/camel/v1alpha1"
+	"github.com/apache/camel-k/version"
 )
 
 // Compute a digest of the fields that are relevant for the deployment
@@ -33,8 +34,8 @@ func Compute(integration *v1alpha1.Integration) string {
 	// Operator version is relevant
 	hash.Write([]byte(version.Version))
 	// Integration relevant fields
-	if integration.Spec.Source.Code != nil {
-		hash.Write([]byte(*integration.Spec.Source.Code))
+	if integration.Spec.Source.Content != nil {
+		hash.Write([]byte(*integration.Spec.Source.Content))
 	}
 	// Add a letter at the beginning and use URL safe encoding
 	return "v" + base64.RawURLEncoding.EncodeToString(hash.Sum(nil))

pkg/util/maven/maven.go

@@ -26,6 +26,8 @@ import (
 	"os"
 	"os/exec"
 	"path"
+	"regexp"
+	"strings"
 
 	"github.com/pkg/errors"
 	"github.com/sirupsen/logrus"
@@ -246,3 +248,28 @@ func pomFileContent(project Project) (string, error) {
 
 	return w.String(), nil
 }
+
+func ParseGAV(gav string) (Dependency, error) {
+	// <groupId>:<artifactId>[:<packagingType>[:<classifier>]]:(<version>|'?')
+	dep := Dependency{}
+	rex := regexp.MustCompile("([^: ]+):([^: ]+)(:([^: ]*)(:([^: ]+))?)?(:([^: ]+))?")
+	res := rex.FindStringSubmatch(gav)
+
+	dep.GroupId = res[1]
+	dep.ArtifactId = res[2]
+	dep.Type = "jar"
+
+	cnt := strings.Count(gav, ":")
+	if cnt == 2 {
+		dep.Version = res[4]
+	} else if cnt == 3 {
+		dep.Type = res[4]
+		dep.Version = res[6]
+	} else {
+		dep.Type = res[4]
+		dep.Classifier = res[6]
+		dep.Version = res[8]
+	}
+
+	return dep, nil
+}

pkg/util/maven/mavent_test.go

@@ -67,3 +67,36 @@ func TestPomGeneration(t *testing.T) {
 
 	assert.Equal(t, pom, expectedPom)
 }
+
+func TestParseSimpleGAV(t *testing.T) {
+	dep, err := ParseGAV("org.apache.camel:camel-core:2.21.1")
+
+	assert.Nil(t, err)
+	assert.Equal(t, dep.GroupId, "org.apache.camel")
+	assert.Equal(t, dep.ArtifactId, "camel-core")
+	assert.Equal(t, dep.Version, "2.21.1")
+	assert.Equal(t, dep.Type, "jar")
+	assert.Equal(t, dep.Classifier, "")
+}
+
+func TestParseGAVWithType(t *testing.T) {
+	dep, err := ParseGAV("org.apache.camel:camel-core:war:2.21.1")
+
+	assert.Nil(t, err)
+	assert.Equal(t, dep.GroupId, "org.apache.camel")
+	assert.Equal(t, dep.ArtifactId, "camel-core")
+	assert.Equal(t, dep.Version, "2.21.1")
+	assert.Equal(t, dep.Type, "war")
+	assert.Equal(t, dep.Classifier, "")
+}
+
+func TestParseGAVWithClassifierAndType(t *testing.T) {
+	dep, err := ParseGAV("org.apache.camel:camel-core:war:test:2.21.1")
+
+	assert.Nil(t, err)
+	assert.Equal(t, dep.GroupId, "org.apache.camel")
+	assert.Equal(t, dep.ArtifactId, "camel-core")
+	assert.Equal(t, dep.Version, "2.21.1")
+	assert.Equal(t, dep.Type, "war")
+	assert.Equal(t, dep.Classifier, "test")
+}

pkg/util/maven/types.go

@@ -17,7 +17,9 @@ limitations under the License.
 
 package maven
 
-import "encoding/xml"
+import (
+	"encoding/xml"
+)
 
 type ProjectDefinition struct {
 	Project     Project
@@ -45,5 +47,17 @@ type Dependencies struct {
 type Dependency struct {
 	GroupId    string `xml:"groupId"`
 	ArtifactId string `xml:"artifactId"`
-	Version    string `xml:"version"`
+	Version    string `xml:"version,omitempty"`
+	Type       string `xml:"type,omitempty"`
+	Classifier string `xml:"classifier,omitempty"`
+}
+
+func NewDependency(groupId string, artifactId string, version string) Dependency {
+	return Dependency{
+		GroupId:    groupId,
+		ArtifactId: artifactId,
+		Version:    version,
+		Type:       "jar",
+		Classifier: "",
+	}
 }

Sample.java → runtime/examples/Sample.java

@@ -1,14 +1,10 @@
-package kamel;
-
 import org.apache.camel.builder.RouteBuilder;
 
-public class Routes extends RouteBuilder {
-
+public class Sample extends RouteBuilder {
   @Override
   public void configure() throws Exception {
 	  from("timer:tick")
     .setBody(constant("-\n             r\n             o\n             c\nHello! Camel K\n             s\n             !\n"))
 		.to("log:info?skipBodyLineSeparator=false");
   }
-
 }