Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Refactoring modules #61

Merged
merged 36 commits into from
Mar 25, 2016
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
36 commits
Select commit Hold shift + click to select a range
ec7bd26
Updating build parameters.
karma4u101 Jan 6, 2016
05afe6c
Improving Tookit initialization and removing the need of a separate init
karma4u101 Jan 6, 2016
dfb85a8
Adding more tests to cover all resource initialization.
karma4u101 Jan 6, 2016
40156d6
Adding fobo-pace-res module in Pace-Res folder and referencing it from
karma4u101 Jan 8, 2016
a841a4b
Adding fobo-angular-api and fobo-angular-res modules. Implementing the
karma4u101 Jan 16, 2016
e1912e3
Tests has been added for AngularJS and AngularJS-Res using Resouce.Init
karma4u101 Jan 31, 2016
1f5b588
Cleaning up unused functions in FoBoAJResSpec.
karma4u101 Jan 31, 2016
305da43
Most if not all AngularJs related changes for this PR is now in place.
karma4u101 Feb 21, 2016
6bf97ad
Case #56 Updating the Pace module adding Pace-Res and Pace-API.
karma4u101 Feb 27, 2016
a323dbc
Case #59 Updateing the KineticJS module adding KineticJS-API and
karma4u101 Feb 27, 2016
9e92a57
Case #56 updating the FoBo build to use the new modules.
karma4u101 Feb 27, 2016
a53b075
Angular readme documentation update.
karma4u101 Feb 27, 2016
f5230a1
Removing old credentials path for sonatype.
karma4u101 Feb 27, 2016
19839ea
Re-aligning api paths with whats expected for FoBo v1.5 to avoid
karma4u101 Feb 28, 2016
9390a06
Adding Font-Awesome Res and API with tests.
karma4u101 Feb 28, 2016
36c0504
Fixing Pace tests.
karma4u101 Feb 28, 2016
450fa38
Updating ignore file.
karma4u101 Feb 28, 2016
154c753
Scala doc updates.
karma4u101 Mar 5, 2016
1f643e9
Adding Google Code Prettify Resouce module to the build system and
karma4u101 Mar 5, 2016
edebbd8
Fixing deprication text in FoBoGCP
karma4u101 Mar 6, 2016
b1a0dfa
Updating som scaladoc information.
karma4u101 Mar 6, 2016
ceb3ab2
Scaladoc update.
karma4u101 Mar 7, 2016
36eff39
WIP JQuery updates.
karma4u101 Mar 7, 2016
4589168
More work on the JQuery modules, tests are now implemented.
karma4u101 Mar 13, 2016
3280f1b
Some code refactorings.
karma4u101 Mar 13, 2016
c6c4b28
Fixing travis test build error, bumping specs2 version for Lift 3 usage
karma4u101 Mar 13, 2016
077eead
Fixing #64
karma4u101 Mar 16, 2016
b6c36e3
Fixing #64 Turned out that tests needed the servlet-api depenency
karma4u101 Mar 16, 2016
223bc8b
Adding more toolkit and resoruce settings to FoBo.
karma4u101 Mar 19, 2016
62129d4
Merge remote-tracking branch 'origin/develop' into ref_mod
karma4u101 Mar 19, 2016
3ff4a92
WIP updating FoBo tests.
karma4u101 Mar 19, 2016
689f971
Adding TwBs-Bootstrap API and Res modules. Some tests is not yet
karma4u101 Mar 20, 2016
321484a
Adding Font-Awesome v4.5.0
karma4u101 Mar 20, 2016
67cab9f
More tests imp.
karma4u101 Mar 23, 2016
6fe7ded
Adding Twitter-Bootstrap-API and Twitter-Bootstrap-Res modules
karma4u101 Mar 25, 2016
6dd477f
Adjusting build to handle both Lift v2.6.2 and v3.0 dependencies.
karma4u101 Mar 25, 2016
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
The diff you're trying to view is too large. We only load the first 3000 changed files.
8 changes: 8 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
/bin/
/target/
/.classpath
/.project
/.settings/
/build.log
/.tmpBin/
/.README.md.html
5 changes: 5 additions & 0 deletions AngularJS-API/.gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
/.settings
/.classpath
/.project
/target/
/README.md~
22 changes: 22 additions & 0 deletions AngularJS-API/LICENSE.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
The MIT License

Copyright (c) 2010-2012 Google, Inc. http://angularjs.org

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
in the Software without restriction, including without limitation the rights
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
copies of the Software, and to permit persons to whom the Software is
furnished to do so, subject to the following conditions:

The above copyright notice and this permission notice shall be included in
all copies or substantial portions of the Software.

THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
THE SOFTWARE.

51 changes: 51 additions & 0 deletions AngularJS-API/README.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,51 @@
# FoBo AngularJS API Module

This API module provides FoBo/Lift API functions for the AngularJS Module.
For more information on the AngularJS API module see [FoBo AngularJS Module](https://github.com/karma4u101/AngularJS).

### Lift FoBo boot hooks (when used in the FoBo module)

import net.liftmodules.FoBo
:
FoBo.API.Init=FoBo.API.AngularJS1

### Lift FoBo boot hooks (when used as stand alone module)

import net.liftmodules.{FoBoAJS => FoBo}
:
FoBo.API.Init=FoBo.API.AngularJS1

### Dependancy settings

Put the following in your project build.sbt files lift libraryDependencies section

"net.liftmodules" %% "moduleName_x1.y1 % "x2.y2[.z2][-SNAPSHOT/rcx/mx]"

or if you are using Maven

<dependency>
<groupId>net.liftmodules</groupId>
<artifactId>moduleName_x1.y1_a.b.c</artifactId>
<version>x2.y2[.z2][-SNAPSHOT/rcx/mx]</version>
</dependency>

Where x1.y1 is Lift major and minor version numbers and a.b.c is Scala
version number and x2.y2.[z2] is the module's major x2, minor y2 and
eventual incremental numbers z2 followed by a eventual SNAPSHOT
release candidate (rcX) or milestone (mX) version part.

For example (when using this module as a separete stand alone module outside of FoBo):

"net.liftmodules" %% "fobo-angularjs-api_2.6 % "1.6"
:
<dependency>
<groupId>net.liftmodules</groupId>
<artifactId>fobo-angularjs-api_2.6_2.10.4</artifactId>
<version>1.6</version>
</dependency>

The example will include a module built for lift 2.6. If you are using maven observe that the artifact id also needs the Scala version.

## Contributions
Improvements, contributions and suggestions are welcome! Clone the project and start working on a PR. You can also leave a issue report or drop a question/suggestion to the [Lift's mailing list](http://groups.google.com/group/liftweb/)

140 changes: 140 additions & 0 deletions AngularJS-API/build.sbt
Original file line number Diff line number Diff line change
@@ -0,0 +1,140 @@
moduleName := "fobo-angularjs-api"

organization := "net.liftmodules"

moduleName <<= (name, liftEdition) { (n, e) => n + "_" + e }

crossScalaVersions := Seq("2.11.4", "2.10.4", "2.9.3", "2.9.2", "2.9.1-1", "2.9.1")

scalacOptions ++= Seq("-deprecation") //,"-feature" <==cant use as long as we build using 2.9.x

parallelExecution in Test := false

EclipseKeys.withSource := true

//if(!liftEdition.equals("3.0")) excludeFilter in unmanagedSources := HiddenFileFilter || "net.liftweb.http.PageRoundTrips.scala"

resolvers ++= Seq(
"Scala Snapshots" at "https://oss.sonatype.org/content/repositories/snapshots/",
"Scala" at "https://oss.sonatype.org/content/groups/scala-tools/"
)

libraryDependencies <++= liftVersion { v =>
"net.liftweb" %% "lift-webkit" % v % "provided" ::
"net.liftweb" %% "lift-testkit" % v % "provided" ::
"net.liftweb" %% "lift-mapper" % v % "provided" ::
Nil
}

libraryDependencies <++= scalaVersion { sv =>
(sv match {
case "2.9.2" | "2.9.1" | "2.9.1-1" => "org.specs2" %% "specs2" % "1.12.3" % "test"
case "2.10.4" => "org.specs2" %% "specs2" % "1.13" % "test"
case _ => "org.specs2" %% "specs2" % "3.7" % "test"
}) ::
(sv match {
case "2.10.4" | "2.9.2" | "2.9.1" | "2.9.1-1" => "org.scalacheck" %% "scalacheck" % "1.10.0" % "test"
case _ => "org.specs2" %% "specs2-scalacheck" % "3.7" % "test"
}) ::
Nil
}

libraryDependencies ++= {
"ch.qos.logback" % "logback-classic" % "1.0.0" % "provided" ::
"log4j" % "log4j" % "1.2.16" % "provided" ::
Nil
}

//############################################################
//#### THE BUILDINFO BUILD
//## https://github.com/sbt/sbt-buildinfo
//##
//##
//#############################################################

//seq(buildInfoSettings: _*)

//sourceGenerators in Compile <+= buildInfo

//buildInfoKeys := Seq[BuildInfoKey](name, version, scalaVersion, sbtVersion)

//buildInfoPackage := "net.liftmodules.FoBo.lib"


//#########################################################################
//#### THE LESS BUILD
//##
//## To simplify, the less build has been moved to the FoBo-Less project.
//## Bootstrap css files, slightly modified to work in the FoBo environment,
//## is built in the FoBo-Less project and then copied (already present) to
//## there corresponding src/resources directories.
//##
//#########################################################################

//Take a look att FoBo-Less and read the above.

//################################################################
//#### THE YUI COMPRESSION BUILD
//## The yui js compression stuff dose currently not work so
//## for now the last filter string in exludeFilter for js
//## will exclude every .js file
//################################################################
//##Turning of the yui compression as we now use upstreem minified files.
//seq(yuiSettings: _*)

//excludeFilter in (Compile, YuiCompressorKeys.jsResources) := "*-debug.js" | "*-min.js" | "*.js"

//excludeFilter in (Compile, YuiCompressorKeys.cssResources) := "*-debug.css" | "*-min.css" | "*.min.css"

//YuiCompressorKeys.minSuffix := "-min"

//################################################################
//#### Publish to Sonatype
//##
//##
//##
//################################################################
credentials += Credentials(Path.userHome / ".sbt" / "liftmodules" /".credentials" )

credentials += Credentials( file("/private/liftmodules/sonatype.credentials") )

publishTo <<= version { v: String =>
val sonatype = "https://oss.sonatype.org/"
if (v.trim.endsWith("SNAPSHOT"))
Some("snapshots" at sonatype + "content/repositories/snapshots")
else
Some("releases" at sonatype + "service/local/staging/deploy/maven2")
}

publishMavenStyle := true

publishArtifact in Test := false

pomIncludeRepository := { x => false }

pomExtra := (
<url>http://www.media4u101.se/fobo-lift-template-demo/</url>
<licenses>
<license>
<name>The Apache Software License, Version 2.0</name>
<url>http://maven.apache.org/ref/2.1.0/maven-profile/license.html</url>
<distribution>repo</distribution>
</license>
</licenses>
<scm>
<url>git@github.com:karma4u101/FoBo.git</url>
<connection>scm:git:git@github.com:karma4u101/FoBo.git</connection>
</scm>
<developers>
<developer>
<id>karma4u101</id>
<name>Peter Petersson</name>
<url>http://www.media4u101.se</url>
</developer>
</developers>
)





140 changes: 140 additions & 0 deletions AngularJS-API/build.sbt~
Original file line number Diff line number Diff line change
@@ -0,0 +1,140 @@
moduleName := "fobo-angularjs"

organization := "net.liftmodules"

moduleName <<= (name, liftEdition) { (n, e) => n + "_" + e }

crossScalaVersions := Seq("2.11.4", "2.10.4", "2.9.3", "2.9.2", "2.9.1-1", "2.9.1")

scalacOptions ++= Seq("-deprecation") //,"-feature" <==cant use as long as we build using 2.9.x

parallelExecution in Test := false

EclipseKeys.withSource := true

//if(!liftEdition.equals("3.0")) excludeFilter in unmanagedSources := HiddenFileFilter || "net.liftweb.http.PageRoundTrips.scala"

resolvers ++= Seq(
"Scala Snapshots" at "https://oss.sonatype.org/content/repositories/snapshots/",
"Scala" at "https://oss.sonatype.org/content/groups/scala-tools/"
)

libraryDependencies <++= liftVersion { v =>
"net.liftweb" %% "lift-webkit" % v % "provided" ::
"net.liftweb" %% "lift-testkit" % v % "provided" ::
"net.liftweb" %% "lift-mapper" % v % "provided" ::
Nil
}

libraryDependencies <++= scalaVersion { sv =>
(sv match {
case "2.9.2" | "2.9.1" | "2.9.1-1" => "org.specs2" %% "specs2" % "1.12.3" % "test"
case "2.10.4" => "org.specs2" %% "specs2" % "1.13" % "test"
case _ => "org.specs2" %% "specs2" % "2.3.11" % "test"
}) ::
(sv match {
case "2.10.4" | "2.9.2" | "2.9.1" | "2.9.1-1" => "org.scalacheck" %% "scalacheck" % "1.10.0" % "test"
case _ => "org.scalacheck" %% "scalacheck" % "1.11.4" % "test"
}) ::
Nil
}

libraryDependencies ++= {
"ch.qos.logback" % "logback-classic" % "1.0.0" % "provided" ::
"log4j" % "log4j" % "1.2.16" % "provided" ::
Nil
}

//############################################################
//#### THE BUILDINFO BUILD
//## https://github.com/sbt/sbt-buildinfo
//##
//##
//#############################################################

//seq(buildInfoSettings: _*)

//sourceGenerators in Compile <+= buildInfo

//buildInfoKeys := Seq[BuildInfoKey](name, version, scalaVersion, sbtVersion)

//buildInfoPackage := "net.liftmodules.FoBo.lib"


//#########################################################################
//#### THE LESS BUILD
//##
//## To simplify, the less build has been moved to the FoBo-Less project.
//## Bootstrap css files, slightly modified to work in the FoBo environment,
//## is built in the FoBo-Less project and then copied (already present) to
//## there corresponding src/resources directories.
//##
//#########################################################################

//Take a look att FoBo-Less and read the above.

//################################################################
//#### THE YUI COMPRESSION BUILD
//## The yui js compression stuff dose currently not work so
//## for now the last filter string in exludeFilter for js
//## will exclude every .js file
//################################################################
//##Turning of the yui compression as we now use upstreem minified files.
//seq(yuiSettings: _*)

//excludeFilter in (Compile, YuiCompressorKeys.jsResources) := "*-debug.js" | "*-min.js" | "*.js"

//excludeFilter in (Compile, YuiCompressorKeys.cssResources) := "*-debug.css" | "*-min.css" | "*.min.css"

//YuiCompressorKeys.minSuffix := "-min"

//################################################################
//#### Publish to Sonatype
//##
//##
//##
//################################################################
credentials += Credentials(Path.userHome / ".sbt" / "liftmodules" /".credentials" )

credentials += Credentials( file("/private/liftmodules/sonatype.credentials") )

publishTo <<= version { v: String =>
val sonatype = "https://oss.sonatype.org/"
if (v.trim.endsWith("SNAPSHOT"))
Some("snapshots" at sonatype + "content/repositories/snapshots")
else
Some("releases" at sonatype + "service/local/staging/deploy/maven2")
}

publishMavenStyle := true

publishArtifact in Test := false

pomIncludeRepository := { x => false }

pomExtra := (
<url>http://www.media4u101.se/fobo-lift-template-demo/</url>
<licenses>
<license>
<name>The Apache Software License, Version 2.0</name>
<url>http://maven.apache.org/ref/2.1.0/maven-profile/license.html</url>
<distribution>repo</distribution>
</license>
</licenses>
<scm>
<url>git@github.com:karma4u101/FoBo.git</url>
<connection>scm:git:git@github.com:karma4u101/FoBo.git</connection>
</scm>
<developers>
<developer>
<id>karma4u101</id>
<name>Peter Petersson</name>
<url>http://www.media4u101.se</url>
</developer>
</developers>
)





1 change: 1 addition & 0 deletions AngularJS-API/project/.gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
/target/
Empty file.
Loading