Updated Branches:
  refs/heads/master 029958d3b -> 01006fc07

console sso related fixes


Project: http://git-wip-us.apache.org/repos/asf/incubator-stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-stratos/commit/f7234c88
Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/f7234c88
Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/f7234c88

Branch: refs/heads/master
Commit: f7234c88fbfdd1c13960cbb323bbb9f1189ec92f
Parents: a0d6ce5
Author: Pradeep Fernando <[email protected]>
Authored: Sun Jan 12 14:17:03 2014 +0530
Committer: Pradeep Fernando <[email protected]>
Committed: Sun Jan 12 14:17:03 2014 +0530

----------------------------------------------------------------------
 .../console/README.md                           | 36 ++++----------------
 .../conf/application-authenticators.xml         | 23 +++++++++++++
 .../modules/distribution/src/assembly/bin.xml   |  6 ++++
 .../modules/p2-profile-gen/pom.xml              | 14 ++++++++
 4 files changed, 50 insertions(+), 29 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/f7234c88/components/org.apache.stratos.manager.console/console/README.md
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.manager.console/console/README.md 
b/components/org.apache.stratos.manager.console/console/README.md
index 13e060e..5374670 100644
--- a/components/org.apache.stratos.manager.console/console/README.md
+++ b/components/org.apache.stratos.manager.console/console/README.md
@@ -1,33 +1,11 @@
-#wso2-samples-store
+#apache-stratos-console
 ==================
 
-This is an example Jaggery application to demonstrate the features of caramel 
framework.
+SSO configuration in the IDP side
 
-##Installing
-
-* Copy `wso2-samples-store` webapp into a Jaggery server which has caramel 
module installed.
-* You can straightaway try this on [WSO2 UES 
1.0.0](http://wso2.com/products/user-engagement-server).
-* If you change the webapp context, you need to update the value of `context` 
object key in`wso2-samples-store/app.js`
-to match you context.
-
-##Documentation
-
-* This sample contains 2 different themes for the same webapp. All themes 
resides on `themes` directory and you can add
-any number of themes as you want.
-* Theme for a particular HTTP request is determined by evaluating the theme 
callback that you specified in `caramel`
-configuration.
-* `caramel` configuration is set when the app get deployed using the init 
script `app.js`.
-* According to the logic in this particular caramel configuration, theme can 
be switched by specifying `theme` url
-parameter with desired theme name. Then, selected theme will be stored in user 
session and will be used for subsequent
-requests.
-* `theme0` is a very basic theme which use only the core apis of `caramel`.
-* `theme1` is a theme based on the `handlebars` engine which is an extension 
on top of `caramel` core.
-* A theme can have their own theme engine and each theme has complete control 
over the data been rendered for each
-request.
-* In order to switch to `theme0`, use 
[http://localhost:9763/wso2-samples-store/?theme=theme0](http://localhost:9763/wso2-samples-store/?theme=theme0)
-* In order to switch to `theme1`, use 
[http://localhost:9763/wso2-samples-store/?theme=theme1](http://localhost:9763/wso2-samples-store/?theme=theme1)
-* Once you switched to a theme, you can void `theme` parameter.
-* Please refer architecture diagrams in `docs` directory along with the app 
source to learn more.
-* There are several more features of caramel like i18n, client side rendering 
etc. which will be added to this sample
-in the future.
+- Issuer : console
+- assertion consuming URL : https://localhost:9443/console/controllers/acs.jag
+- enable response signing
+- enable assertion signing
+- audience restriction - https://localhost:9445/oauth2/token
 

http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/f7234c88/products/stratos-manager/conf/application-authenticators.xml
----------------------------------------------------------------------
diff --git a/products/stratos-manager/conf/application-authenticators.xml 
b/products/stratos-manager/conf/application-authenticators.xml
new file mode 100644
index 0000000..5010e2c
--- /dev/null
+++ b/products/stratos-manager/conf/application-authenticators.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+
+<!--
+  ~ Copyright 2005-2013 WSO2, Inc. (http://wso2.com)
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~ http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  -->
+
+<Authenticators>
+       <Authenticator name="BasicAuthenticator" disabled="false" factor="1">
+               <Status value="10" loginPage="/sso/login" />
+       </Authenticator>
+</Authenticators>

http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/f7234c88/products/stratos-manager/modules/distribution/src/assembly/bin.xml
----------------------------------------------------------------------
diff --git a/products/stratos-manager/modules/distribution/src/assembly/bin.xml 
b/products/stratos-manager/modules/distribution/src/assembly/bin.xml
index c22c302..1db6eae 100755
--- a/products/stratos-manager/modules/distribution/src/assembly/bin.xml
+++ b/products/stratos-manager/modules/distribution/src/assembly/bin.xml
@@ -675,6 +675,12 @@
            <destName>jaas.conf</destName>
             <filtered>true</filtered>
         </file>
+        <!--Application authenticators -->
+        <file>
+            <source>../../conf/application-authenticators.xml</source>
+            
<outputDirectory>${pom.artifactId}-${pom.version}/repository/conf/security/</outputDirectory>
+            <fileMode>644</fileMode>
+        </file>
         <!-- REST endpoint webapp -->
         <file>
             
<source>../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/deployment/server/webapps/stratos.war</source>

http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/f7234c88/products/stratos-manager/modules/p2-profile-gen/pom.xml
----------------------------------------------------------------------
diff --git a/products/stratos-manager/modules/p2-profile-gen/pom.xml 
b/products/stratos-manager/modules/p2-profile-gen/pom.xml
index e54757a..7883004 100644
--- a/products/stratos-manager/modules/p2-profile-gen/pom.xml
+++ b/products/stratos-manager/modules/p2-profile-gen/pom.xml
@@ -270,6 +270,12 @@
                                     org.wso2.store:org.wso2.store.feature:1.0.0
                                 </featureArtifactDef>
                                <featureArtifactDef>
+                                    
org.wso2.carbon:org.wso2.carbon.identity.application.authenticator.basicauth.server.feature:4.2.1
+                                </featureArtifactDef>
+                                <featureArtifactDef>
+                                    
org.wso2.carbon:org.wso2.carbon.identity.application.authentication.framework.server.feature:4.2.1
+                                </featureArtifactDef>
+                               <featureArtifactDef>
                                     
org.apache.stratos:org.apache.stratos.messaging.feature:${project.version}
                                 </featureArtifactDef>
 
@@ -471,6 +477,14 @@
                         <id>org.wso2.store.feature.group</id>
                         <version>1.0.0</version>
                     </feature>
+                    <feature>
+                                    
<id>org.wso2.carbon.identity.application.authenticator.basicauth.server.feature.group</id>
+                                    <version>4.2.1</version>
+                                </feature>
+                                <feature>
+                                    
<id>org.wso2.carbon.identity.application.authentication.framework.server.feature.group</id>
+                                    <version>4.2.1</version>
+                                </feature>
                                   </features>
 
                         </configuration>

Reply via email to