Skip to content

OJO que no sé lo que estoy haciendo #1

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.

Sign up for GitHub

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

Open
csierra wants to merge 5 commits into
base: master
Choose a base branch
from
Open

OJO que no sé lo que estoy haciendo #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
e0dda81
[bndtools] blade.hook.jsp demo
AndyWu2015 Nov 13, 2015
a8ad5b7
Merge pull request #179 from AndyWu2015/bndtools
gamerson Nov 16, 2015
20b9a1c
Merge pull request #180 from AndyWu2015/readme
gamerson Nov 16, 2015
067c112
Correct imports
Nov 17, 2015
f97c013
OJO que no sé lo que estoy haciendo
Nov 18, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions bndtools/blade.hook.jsp/.classpath
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
<classpathentry kind="src" path="src"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>
<classpathentry kind="con" path="aQute.bnd.classpath.container"/>
<classpathentry kind="output" path="bin"/>
</classpath>
23 changes: 23 additions & 0 deletions bndtools/blade.hook.jsp/.project
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
<name>blade.hook.jsp</name>
<comment></comment>
<projects>
</projects>
<buildSpec>
<buildCommand>
<name>org.eclipse.jdt.core.javabuilder</name>
<arguments>
</arguments>
</buildCommand>
<buildCommand>
<name>bndtools.core.bndbuilder</name>
<arguments>
</arguments>
</buildCommand>
</buildSpec>
<natures>
<nature>org.eclipse.jdt.core.javanature</nature>
<nature>bndtools.core.bndnature</nature>
</natures>
</projectDescription>
7 changes: 7 additions & 0 deletions bndtools/blade.hook.jsp/bnd.bnd
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
Bundle-Name: Blade Hook Jsp
Bundle-SymbolicName: blade.hook.jsp
Bundle-Version: 1.0.0.${tstamp}
Fragment-Host: com.liferay.login.web;bundle-version="1.0.0"
-includeresource:\
META-INF/resources=resources
-sources: true
178 changes: 178 additions & 0 deletions bndtools/blade.hook.jsp/resources/login.jsp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,178 @@
<%--
/**
* Copyright (c) 2000-present Liferay, Inc. All rights reserved.
*
* This library is free software; you can redistribute it and/or modify it under
* the terms of the GNU Lesser General Public License as published by the Free
* Software Foundation; either version 2.1 of the License, or (at your option)
* any later version.
*
* This library is distributed in the hope that it will be useful, but WITHOUT
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
* FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
* details.
*/
--%>

<%@ include file="/init.jsp" %>
<p style="color: red">changed</p>
<c:choose>
<c:when test="<%= themeDisplay.isSignedIn() %>">

<%
String signedInAs = HtmlUtil.escape(user.getFullName());

if (themeDisplay.isShowMyAccountIcon() && (themeDisplay.getURLMyAccount() != null)) {
String myAccountURL = String.valueOf(themeDisplay.getURLMyAccount());

signedInAs = "<a class=\"signed-in\" href=\"" + HtmlUtil.escape(myAccountURL) + "\">" + signedInAs + "</a>";
}
%>

<liferay-ui:message arguments="<%= signedInAs %>" key="you-are-signed-in-as-x" translateArguments="<%= false %>" />
</c:when>
<c:otherwise>

<%
String redirect = ParamUtil.getString(request, "redirect");

String login = LoginUtil.getLogin(request, "login", company);
String password = StringPool.BLANK;
boolean rememberMe = ParamUtil.getBoolean(request, "rememberMe");

if (Validator.isNull(authType)) {
authType = company.getAuthType();
}
%>

<portlet:actionURL name="/login/login" secure="<%= PropsValues.COMPANY_SECURITY_AUTH_REQUIRES_HTTPS || request.isSecure() %>" var="loginURL" />

<aui:form action="<%= loginURL %>" autocomplete='<%= PropsValues.COMPANY_SECURITY_LOGIN_FORM_AUTOCOMPLETE ? "on" : "off" %>' cssClass="sign-in-form" method="post" name="fm" onSubmit="event.preventDefault();">
<aui:input name="saveLastPath" type="hidden" value="<%= false %>" />
<aui:input name="redirect" type="hidden" value="<%= redirect %>" />
<aui:input name="doActionAfterLogin" type="hidden" value="<%= portletName.equals(PortletKeys.FAST_LOGIN) ? true : false %>" />

<c:choose>
<c:when test='<%= SessionMessages.contains(request, "userAdded") %>'>

<%
String userEmailAddress = (String)SessionMessages.get(request, "userAdded");
String userPassword = (String)SessionMessages.get(request, "userAddedPassword");
%>

<div class="alert alert-success">
<c:choose>
<c:when test="<%= company.isStrangersVerify() || Validator.isNull(userPassword) %>">
<liferay-ui:message key="thank-you-for-creating-an-account" />

<c:if test="<%= company.isStrangersVerify() %>">
<liferay-ui:message arguments="<%= userEmailAddress %>" key="your-email-verification-code-has-been-sent-to-x" translateArguments="<%= false %>" />
</c:if>
</c:when>
<c:otherwise>
<liferay-ui:message arguments="<%= userPassword %>" key="thank-you-for-creating-an-account.-your-password-is-x" translateArguments="<%= false %>" />
</c:otherwise>
</c:choose>

<c:if test="<%= PrefsPropsUtil.getBoolean(company.getCompanyId(), PropsKeys.ADMIN_EMAIL_USER_ADDED_ENABLED) %>">
<liferay-ui:message arguments="<%= userEmailAddress %>" key="your-password-has-been-sent-to-x" translateArguments="<%= false %>" />
</c:if>
</div>
</c:when>
<c:when test='<%= SessionMessages.contains(request, "userPending") %>'>

<%
String userEmailAddress = (String)SessionMessages.get(request, "userPending");
%>

<div class="alert alert-success">
<liferay-ui:message arguments="<%= userEmailAddress %>" key="thank-you-for-creating-an-account.-you-will-be-notified-via-email-at-x-when-your-account-has-been-approved" translateArguments="<%= false %>" />
</div>
</c:when>
</c:choose>

<liferay-ui:error exception="<%= AuthException.class %>" message="authentication-failed" />
<liferay-ui:error exception="<%= CompanyMaxUsersException.class %>" message="unable-to-log-in-because-the-maximum-number-of-users-has-been-reached" />
<liferay-ui:error exception="<%= CookieNotSupportedException.class %>" message="authentication-failed-please-enable-browser-cookies" />
<liferay-ui:error exception="<%= NoSuchUserException.class %>" message="authentication-failed" />
<liferay-ui:error exception="<%= PasswordExpiredException.class %>" message="your-password-has-expired" />
<liferay-ui:error exception="<%= UserEmailAddressException.MustNotBeNull.class %>" message="please-enter-an-email-address" />
<liferay-ui:error exception="<%= UserLockoutException.LDAPLockout.class %>" message="this-account-is-locked" />

<liferay-ui:error exception="<%= UserLockoutException.PasswordPolicyLockout.class %>">

<%
UserLockoutException.PasswordPolicyLockout ule = (UserLockoutException.PasswordPolicyLockout)errorException;
%>

<liferay-ui:message arguments="<%= ule.user.getUnlockDate() %>" key="this-account-is-locked-until-x" translateArguments="<%= false %>" />
</liferay-ui:error>

<liferay-ui:error exception="<%= UserPasswordException.class %>" message="authentication-failed" />
<liferay-ui:error exception="<%= UserScreenNameException.MustNotBeNull.class %>" message="the-screen-name-cannot-be-blank" />

<aui:fieldset>

<%
String loginLabel = null;

if (authType.equals(CompanyConstants.AUTH_TYPE_EA)) {
loginLabel = "email-address";
}
else if (authType.equals(CompanyConstants.AUTH_TYPE_SN)) {
loginLabel = "screen-name";
}
else if (authType.equals(CompanyConstants.AUTH_TYPE_ID)) {
loginLabel = "id";
}
%>

<aui:input autoFocus="<%= windowState.equals(LiferayWindowState.EXCLUSIVE) || windowState.equals(WindowState.MAXIMIZED) %>" cssClass="clearable" label="<%= loginLabel %>" name="login" showRequiredLabel="<%= false %>" type="text" value="<%= login %>">
<aui:validator name="required" />
</aui:input>

<aui:input name="password" showRequiredLabel="<%= false %>" type="password" value="<%= password %>">
<aui:validator name="required" />
</aui:input>

<span id="<portlet:namespace />passwordCapsLockSpan" style="display: none;"><liferay-ui:message key="caps-lock-is-on" /></span>

<c:if test="<%= company.isAutoLogin() && !PropsValues.SESSION_DISABLED %>">
<aui:input checked="<%= rememberMe %>" name="rememberMe" type="checkbox" />
</c:if>
</aui:fieldset>

<aui:button-row>
<aui:button type="submit" value="sign-in" />
</aui:button-row>
</aui:form>

<liferay-util:include page="/navigation.jsp" servletContext="<%= application %>" />

<aui:script sandbox="<%= true %>">
var form = AUI.$(document.<portlet:namespace />fm);

form.on(
'submit',
function(event) {
var redirect = form.fm('redirect');

if (redirect) {
var redirectVal = redirect.val();

redirect.val(redirectVal + window.location.hash);
}

submitForm(form);
}
);

form.fm('password').on(
'keypress',
function(event) {
Liferay.Util.showCapsLock(event, '<portlet:namespace />passwordCapsLockSpan');
}
);
</aui:script>
</c:otherwise>
</c:choose>
Empty file added bndtools/blade.hook.jsp/src/.gitkeep
View file
Open in desktop
Empty file.
66 changes: 1 addition & 65 deletions bndtools/cnf/local/index.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,69 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<repository increment="1445247825000" name="Local" xmlns="http://www.osgi.org/xmlns/repository/v1.0.0">
<resource>
<capability namespace="osgi.identity">
<attribute name="osgi.identity" value="biz.aQute.remote.agent"/>
<attribute name="type" value="osgi.bundle"/>
<attribute name="version" type="Version" value="3.0.0.201510081031"/>
</capability>
<capability namespace="osgi.content">
<attribute name="osgi.content" value="ee5260f280e2f5cac44b85f6d41c9578b25f959431c69215b386c53d8b18a8ba"/>
<attribute name="url" value="biz.aQute.remote.agent-3.0.0.jar"/>
<attribute name="size" type="Long" value="292349"/>
<attribute name="mime" value="application/vnd.osgi.bundle"/>
</capability>
<capability namespace="osgi.wiring.bundle">
<attribute name="osgi.wiring.bundle" value="biz.aQute.remote.agent"/>
<attribute name="bundle-version" type="Version" value="3.0.0.201510081031"/>
</capability>
<capability namespace="osgi.wiring.host">
<attribute name="osgi.wiring.host" value="biz.aQute.remote.agent"/>
<attribute name="bundle-version" type="Version" value="3.0.0.201510081031"/>
</capability>
<requirement namespace="osgi.wiring.package">
<directive name="filter" value="(&amp;(osgi.wiring.package=org.osgi.framework)(version&gt;=1.5.0)(!(version&gt;=2.0.0)))"/>
</requirement>
<requirement namespace="osgi.wiring.package">
<directive name="filter" value="(&amp;(osgi.wiring.package=org.osgi.framework.launch)(version&gt;=1.0.0)(!(version&gt;=2.0.0)))"/>
</requirement>
<requirement namespace="osgi.wiring.package">
<directive name="filter" value="(&amp;(osgi.wiring.package=org.osgi.framework.wiring)(version&gt;=1.0.0)(!(version&gt;=2.0.0)))"/>
</requirement>
<requirement namespace="osgi.wiring.package">
<directive name="filter" value="(osgi.wiring.package=javax.management)"/>
</requirement>
<requirement namespace="osgi.wiring.package">
<directive name="filter" value="(osgi.wiring.package=javax.management.openmbean)"/>
</requirement>
<requirement namespace="osgi.wiring.package">
<directive name="filter" value="(osgi.wiring.package=javax.management.remote)"/>
</requirement>
<requirement namespace="osgi.wiring.package">
<directive name="filter" value="(&amp;(osgi.wiring.package=org.osgi.resource)(version&gt;=1.0.0)(!(version&gt;=2.0.0)))"/>
</requirement>
<requirement namespace="osgi.wiring.package">
<directive name="filter" value="(&amp;(osgi.wiring.package=org.osgi.util.tracker)(version&gt;=1.5.0)(!(version&gt;=2.0.0)))"/>
</requirement>
<requirement namespace="osgi.wiring.package">
<directive name="filter" value="(&amp;(osgi.wiring.package=org.osgi.dto)(version&gt;=1.0.0)(!(version&gt;=2.0.0)))"/>
<directive name="resolution" value="optional"/>
</requirement>
<requirement namespace="osgi.wiring.package">
<directive name="filter" value="(&amp;(osgi.wiring.package=org.osgi.framework.dto)(version&gt;=1.8.0)(!(version&gt;=2.0.0)))"/>
<directive name="resolution" value="optional"/>
</requirement>
<requirement namespace="osgi.wiring.package">
<directive name="filter" value="(&amp;(osgi.wiring.package=org.osgi.resource.dto)(version&gt;=1.0.0)(!(version&gt;=2.0.0)))"/>
<directive name="resolution" value="optional"/>
</requirement>
<requirement namespace="osgi.wiring.package">
<directive name="filter" value="(&amp;(osgi.wiring.package=org.osgi.framework.wiring.dto)(version&gt;=1.2.0)(!(version&gt;=2.0.0)))"/>
<directive name="resolution" value="optional"/>
</requirement>
<requirement namespace="osgi.ee">
<directive name="filter" value="(&amp;(osgi.ee=JavaSE)(version=1.6))"/>
</requirement>
</resource>
<repository increment="1445483393408" name="Local" xmlns="http://www.osgi.org/xmlns/repository/v1.0.0">
<resource>
<capability namespace="osgi.identity">
<attribute name="osgi.identity" value="biz.aQute.remote.agent"/>
Expand Down
2 changes: 1 addition & 1 deletion bndtools/cnf/local/index.xml.sha
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
c3a6d4105c7b6aab34e86ab6df8a81931d49aec079db1b2378dae01c279de233
89f8c521633e7471dcee33049047787958f724cc4b815b88bb92d0f39aa3db0f
2 changes: 1 addition & 1 deletion bndtools/cnf/release/index.xml.sha
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
262a924c4164db96f2409bfbe8d20793eb0c91a51c3dcd7c2160cde2bac8a492
b699f269b1871b7ef42e54b5ceb7529989f9474ffa4217c696e5ad333ac8936c
44 changes: 43 additions & 1 deletion maven/blade.jsf.portlet.ds/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,16 @@
<groupId>com.sun.faces</groupId>
<artifactId>jsf-impl</artifactId>
</dependency>
<dependency>
<groupId>com.liferay.portal</groupId>
<artifactId>util-bridges</artifactId>
<version>7.0.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>com.liferay.portal</groupId>
<artifactId>util-java</artifactId>
<version>7.0.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>javax.portlet</groupId>
<artifactId>portlet-api</artifactId>
Expand All @@ -40,6 +50,11 @@
<artifactId>org.osgi.compendium</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.osgi</groupId>
<artifactId>org.osgi.core</artifactId>
<version>6.0.0</version>
</dependency>
</dependencies>

<build>
Expand All @@ -54,7 +69,34 @@
<Embed-Transitive>true</Embed-Transitive>
<Include-Resource>{maven-resources}</Include-Resource>
<Private-Package>blade.portlet</Private-Package>
<Import-Package>javax.portlet;version="[2.0,3)",javax.servlet;version="[2.5,4)"</Import-Package>
<Import-Package>
javax.naming,
javax.portlet;version="[2.0,3)",
javax.portlet.filter;version="[2.0,3)",
javax.servlet;version="[2.5,4)",
javax.servlet.http;version="[2.5,4)",
javax.servlet.jsp,
javax.el,
javax.el.*,
javax.management,
javax.management.*,
javax.xml,
javax.xml.*,
com.liferay.portal.model,
com.liferay.staging.portlet.data.handler,
com.liferay.portlet.exportimport.lar,
com.liferay.portal.kernel.log,
com.liferay.portal.kernel.servlet.filters.invoker,
com.liferay.portal.kernel.servlet,
com.liferay.portal.kernel.portlet,
com.sun.el,
org.w3c.dom,
org.w3c.dom.*,
org.xml.sax,
org.xml.sax.*,
org.osgi.*
</Import-Package>
<Web-ContextPath>/blade-portlet</Web-ContextPath>
<_dsannotations>*</_dsannotations>
</instructions>
</configuration>
Expand Down
3 changes: 2 additions & 1 deletion maven/blade.jsf.portlet.ds/src/main/java/blade/portlet/JSFPortletDS.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
*/
package blade.portlet;

import org.osgi.framework.BundleContext;
import org.osgi.service.component.annotations.Activate;
import org.osgi.service.component.annotations.Component;

Expand All @@ -35,7 +36,7 @@
public class JSFPortletDS extends GenericFacesPortlet {

@Activate
public void activate() {
public void activate(BundleContext bundleContext) {
System.err.println("!@#$ activated " + this);
}
}
9 changes: 9 additions & 0 deletions maven/blade.jsf.portlet.ds/src/main/resources/WEB-INF/faces-config.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
<faces-config
xmlns="http://java.sun.com/xml/ns/javaee"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://java.sun.com/xml/ns/javaee
http://java.sun.com/xml/ns/javaee/web-facesconfig_2_0.xsd"
version="2.0">

</faces-config>
Loading